Permalink
Browse files

Don't make some AudioOutput members fully virtual.

Default implementation being that they return false
  • Loading branch information...
jyavenard committed Jun 9, 2013
1 parent cf94452 commit 33d6370607f14b8f28328d760c6933775f5137f0
Showing with 3 additions and 6 deletions.
  1. +3 −3 mythtv/libs/libmyth/audio/audiooutput.h
  2. +0 −3 mythtv/programs/mythtranscode/audioreencodebuffer.h
@@ -132,9 +132,9 @@ class MPUBLIC AudioOutput : public VolumeBase, public OutputListeners
virtual int readOutputData(unsigned char *read_buffer,
int max_length) = 0;
virtual bool IsUpmixing(void) = 0;
virtual bool ToggleUpmix(void) = 0;
virtual bool CanUpmix(void) = 0;
virtual bool IsUpmixing(void) { return false; }
virtual bool ToggleUpmix(void) { return false; }
virtual bool CanUpmix(void) { return false; }
bool PulseStatus(void) { return pulsewassuspended; }
protected:
@@ -57,9 +57,6 @@ class AudioReencodeBuffer : public AudioOutput
virtual void ToggleMute(void) { }
virtual MuteState GetMuteState(void) const { return kMuteOff; }
virtual MuteState IterateMutedChannels(void) { return kMuteOff; }
virtual bool IsUpmixing(void) { return false; }
virtual bool ToggleUpmix(void) { return false; }
virtual bool CanUpmix(void) { return false; }
virtual void SetSWVolume(int new_volume, bool save) { return; }
virtual int GetSWVolume(void) { return 100; }
virtual bool CanPassthrough(int, int, int, int) const

0 comments on commit 33d6370

Please sign in to comment.