summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dxr3device.h4
-rw-r--r--dxr3interface.h2
2 files changed, 2 insertions, 4 deletions
diff --git a/dxr3device.h b/dxr3device.h
index 2ed4856..5f085e7 100644
--- a/dxr3device.h
+++ b/dxr3device.h
@@ -76,12 +76,10 @@ public:
iAudio *getAudioOutput() const { return audioOut; }
-protected:
+private:
ePlayMode m_PlayMode;
cDxr3DemuxDevice m_DemuxDevice;
cDxr3SpuDecoder* m_spuDecoder;
-
-private:
iAudio *audioOut;
};
diff --git a/dxr3interface.h b/dxr3interface.h
index ec25664..06b2f5e 100644
--- a/dxr3interface.h
+++ b/dxr3interface.h
@@ -140,7 +140,7 @@ public:
void SetButton(uint16_t sx, uint16_t sy, uint16_t ex, uint16_t ey,
uint32_t palette);
void ClearButton();
- void SetPalette(unsigned int *pal = NULL);
+ void SetPalette(unsigned int *pal);
// helper functions for dxr3 main osd screen
void ResetHardware();