Merge remote-tracking branch 'tangocash/master'

This commit is contained in:
max_10
2017-10-06 22:38:51 +02:00
2 changed files with 6 additions and 6 deletions

View File

@@ -54,9 +54,6 @@ class cAudio
int volume;
void openDevice(void);
void closeDevice(void);
int do_mute(bool enable, bool remember);
void setBypassMode(bool disable);
@@ -69,6 +66,9 @@ class cAudio
cAudio(void *, void *, void *);
~cAudio(void);
void openDevice(void);
void closeDevice(void);
void *GetHandle() { return NULL; };
/* shut up */
int mute(bool remember = true) { return do_mute(true, remember); };

View File

@@ -158,14 +158,14 @@ class cVideo
int64_t GetPTS(void);
int brightness, contrast, saturation, hue;
void openDevice(void);
void closeDevice(void);
public:
/* constructor & destructor */
cVideo(int mode, void *, void *, unsigned int unit = 0);
~cVideo(void);
void openDevice(void);
void closeDevice(void);
void * GetTVEnc() { return NULL; };
void * GetTVEncSD() { return NULL; };