Fix audio detection capabilities.

Incorrect definition in the base audio class meants that for all audio type but ALSA and Windows DX; audio detection function was never called
MythTV · Feb 28, 2011 · ea4e81c · ea4e81c
1 parent df4b41d
commit ea4e81c
Show file tree

Hide file tree

Showing 13 changed files with 13 additions and 13 deletions.
diff --git a/mythtv/libs/libmyth/audio/audiooutputalsa.h b/mythtv/libs/libmyth/audio/audiooutputalsa.h
@@ -28,7 +28,7 @@ class AudioOutputALSA : public AudioOutputBase
     virtual void CloseDevice(void);
     virtual void WriteAudio(uchar *aubuf, int size);
     virtual int  GetBufferedOnSoundcard(void) const;
-    AudioOutputSettings* GetOutputSettings(bool passthrough = false);
+    AudioOutputSettings* GetOutputSettings(bool passthrough);
 
   private:
     int TryOpenDevice(int open_mode, int try_ac3);

diff --git a/mythtv/libs/libmyth/audio/audiooutputbase.h b/mythtv/libs/libmyth/audio/audiooutputbase.h
@@ -122,7 +122,7 @@ class AudioOutputBase : public AudioOutput, public QThread
      */
     virtual int  GetBufferedOnSoundcard(void) const = 0;
     // Default implementation only supports 2ch s16le at 48kHz
-    virtual AudioOutputSettings* GetOutputSettings(bool digital = false)
+    virtual AudioOutputSettings* GetOutputSettings(bool digital)
         { return new AudioOutputSettings; }
     // You need to call this from any implementation in the dtor.
     void KillAudio(void);

diff --git a/mythtv/libs/libmyth/audio/audiooutputca.cpp b/mythtv/libs/libmyth/audio/audiooutputca.cpp
@@ -234,7 +234,7 @@ bool CoreAudioData::OpenAnalog()
     return true;
 }
 
-AudioOutputSettings* AudioOutputCA::GetOutputSettings()
+AudioOutputSettings* AudioOutputCA::GetOutputSettings(bool /*digital*/)
 {
     AudioOutputSettings *settings = new AudioOutputSettings();
 

diff --git a/mythtv/libs/libmyth/audio/audiooutputca.h b/mythtv/libs/libmyth/audio/audiooutputca.h
@@ -18,7 +18,7 @@ class AudioOutputCA : public AudioOutputBase
     AudioOutputCA(const AudioSettings &settings);
     virtual ~AudioOutputCA();
 
-    AudioOutputSettings* GetOutputSettings(void);
+    AudioOutputSettings* GetOutputSettings(bool /*digital*/);
 
     virtual int64_t GetAudiotime(void);
 

diff --git a/mythtv/libs/libmyth/audio/audiooutputdx.h b/mythtv/libs/libmyth/audio/audiooutputdx.h
@@ -25,7 +25,7 @@ class AudioOutputDX : public AudioOutputBase
     virtual void CloseDevice(void);
     virtual void WriteAudio(unsigned char *buffer, int size);
     virtual int  GetBufferedOnSoundcard(void) const;
-    AudioOutputSettings* GetOutputSettings(bool passthrough = false);
+    AudioOutputSettings* GetOutputSettings(bool passthrough);
 
   protected:
     AudioOutputDXPrivate *m_priv;

diff --git a/mythtv/libs/libmyth/audio/audiooutputjack.cpp b/mythtv/libs/libmyth/audio/audiooutputjack.cpp
@@ -35,7 +35,7 @@ AudioOutputJACK::AudioOutputJACK(const AudioSettings &settings) :
         Reconfigure(settings);
 }
 
-AudioOutputSettings* AudioOutputJACK::GetOutputSettings()
+AudioOutputSettings* AudioOutputJACK::GetOutputSettings(bool /*digital*/)
 {
     int rate = 0;
     int i = 0;

diff --git a/mythtv/libs/libmyth/audio/audiooutputjack.h b/mythtv/libs/libmyth/audio/audiooutputjack.h
@@ -29,7 +29,7 @@ class AudioOutputJACK : public AudioOutputBase
     virtual void CloseDevice(void);
     virtual void WriteAudio(unsigned char *aubuf, int size);
     virtual int  GetBufferedOnSoundcard(void) const;
-    AudioOutputSettings* GetOutputSettings(void);
+    AudioOutputSettings* GetOutputSettings(bool /*digital*/);
 
     // Overriding these to do nothing.  Not needed here.
     virtual bool StartOutputThread(void);

diff --git a/mythtv/libs/libmyth/audio/audiooutputoss.cpp b/mythtv/libs/libmyth/audio/audiooutputoss.cpp
@@ -46,7 +46,7 @@ AudioOutputOSS::~AudioOutputOSS()
     KillAudio();
 }
 
-AudioOutputSettings* AudioOutputOSS::GetOutputSettings()
+AudioOutputSettings* AudioOutputOSS::GetOutputSettings(bool /*digital*/)
 {
     AudioOutputSettings *settings = new AudioOutputSettings();
 

diff --git a/mythtv/libs/libmyth/audio/audiooutputoss.h b/mythtv/libs/libmyth/audio/audiooutputoss.h
@@ -22,7 +22,7 @@ class AudioOutputOSS : public AudioOutputBase
     virtual void CloseDevice(void);
     virtual void WriteAudio(unsigned char *aubuf, int size);
     virtual int  GetBufferedOnSoundcard(void) const;
-    AudioOutputSettings* GetOutputSettings(void);
+    AudioOutputSettings* GetOutputSettings(bool /*digital*/);
 
   private:
     void VolumeInit(void);

diff --git a/mythtv/libs/libmyth/audio/audiooutputpulse.cpp b/mythtv/libs/libmyth/audio/audiooutputpulse.cpp
@@ -52,7 +52,7 @@ AudioOutputPulseAudio::~AudioOutputPulseAudio()
     }
 }
 
-AudioOutputSettings* AudioOutputPulseAudio::GetOutputSettings()
+AudioOutputSettings* AudioOutputPulseAudio::GetOutputSettings(bool /*digital*/)
 {
     AudioFormat fmt;
     m_aosettings = new AudioOutputSettings();

diff --git a/mythtv/libs/libmyth/audio/audiooutputpulse.h b/mythtv/libs/libmyth/audio/audiooutputpulse.h
@@ -35,7 +35,7 @@ class AudioOutputPulseAudio : public AudioOutputBase
     void Drain(void);
 
   protected:
-    AudioOutputSettings* GetOutputSettings(void);
+    AudioOutputSettings* GetOutputSettings(bool /*digital*/);
     bool OpenDevice(void);
     void CloseDevice(void);
     void WriteAudio(unsigned char *aubuf, int size);

diff --git a/mythtv/libs/libmyth/audio/audiooutputwin.cpp b/mythtv/libs/libmyth/audio/audiooutputwin.cpp
@@ -139,7 +139,7 @@ AudioOutputWin::~AudioOutputWin()
     }
 }
 
-AudioOutputSettings* AudioOutputWin::GetOutputSettings(void)
+AudioOutputSettings* AudioOutputWin::GetOutputSettings(bool /*digital*/)
 {
     AudioOutputSettings *settings = new AudioOutputSettings();
 

diff --git a/mythtv/libs/libmyth/audio/audiooutputwin.h b/mythtv/libs/libmyth/audio/audiooutputwin.h
@@ -22,7 +22,7 @@ class AudioOutputWin : public AudioOutputBase
     virtual void CloseDevice(void);
     virtual void WriteAudio(unsigned char *aubuf, int size);
     virtual int  GetBufferedOnSoundcard(void) const;
-    AudioOutputSettings* GetOutputSettings(void);
+    AudioOutputSettings* GetOutputSettings(bool digital);
 
   protected:
     AudioOutputWinPrivate *m_priv;