diff options
author | Christian Gmeiner <christian.gmeiner@gmail.com> | 2010-06-30 16:36:09 +0200 |
---|---|---|
committer | Christian Gmeiner <christian.gmeiner@gmail.com> | 2010-06-30 16:36:09 +0200 |
commit | e08efca34fbdd0cedd41dddab2f52a43294918df (patch) | |
tree | 3abec65c5e5862cd66d03665550a642104a8f502 | |
parent | 959a6597cc832783dd4364bd6f0f9a499b90402a (diff) | |
download | vdr-plugin-dxr3-e08efca34fbdd0cedd41dddab2f52a43294918df.tar.gz vdr-plugin-dxr3-e08efca34fbdd0cedd41dddab2f52a43294918df.tar.bz2 |
simplify setDigitalAudio in output drivers
-rw-r--r-- | dxr3audio-alsa.c | 6 | ||||
-rw-r--r-- | dxr3audio-alsa.h | 2 | ||||
-rw-r--r-- | dxr3audio-pa.h | 1 | ||||
-rw-r--r-- | dxr3audio.c | 10 | ||||
-rw-r--r-- | dxr3audio.h | 2 |
5 files changed, 13 insertions, 8 deletions
diff --git a/dxr3audio-alsa.c b/dxr3audio-alsa.c index 9d36df6..856afdc 100644 --- a/dxr3audio-alsa.c +++ b/dxr3audio-alsa.c @@ -275,13 +275,9 @@ void cAudioAlsa::flush() } } -void cAudioAlsa::setDigitalAudio(bool on) +void cAudioAlsa::reconfigure() { - if (digitalAudio == on) { - return; - } - // TODO stub } void cAudioAlsa::Xrun() diff --git a/dxr3audio-alsa.h b/dxr3audio-alsa.h index b07bf79..dffc23f 100644 --- a/dxr3audio-alsa.h +++ b/dxr3audio-alsa.h @@ -37,7 +37,7 @@ public: virtual void setup(int channels, int samplerate); virtual void write(uchar* data, size_t size); virtual void flush(); - virtual void setDigitalAudio(bool on); + virtual void reconfigure(); private: snd_pcm_t *handle; diff --git a/dxr3audio-pa.h b/dxr3audio-pa.h index a1fe307..4b65d3a 100644 --- a/dxr3audio-pa.h +++ b/dxr3audio-pa.h @@ -38,7 +38,6 @@ public: virtual void flush(); virtual void poll(cPoller &poller) {} - virtual void setDigitalAudio(bool on) {} private: pa_sample_spec ss; diff --git a/dxr3audio.c b/dxr3audio.c index 2b2bc61..2ad7cda 100644 --- a/dxr3audio.c +++ b/dxr3audio.c @@ -79,3 +79,13 @@ void iAudio::changeVolume(int16_t* pcmbuf, size_t size) } } } + +void iAudio::setDigitalAudio(bool on) +{ + if (digitalAudio == on) { + return; + } + + digitalAudio = on; + reconfigure(); +} diff --git a/dxr3audio.h b/dxr3audio.h index 296d7f3..94b59ef 100644 --- a/dxr3audio.h +++ b/dxr3audio.h @@ -50,7 +50,7 @@ public: void setAudioChannel(int channel) { audioChannel = channel; } int getAudioChannel() { return audioChannel; } - virtual void setDigitalAudio(bool on) = 0; + void setDigitalAudio(bool on); bool isDigitalAudio() { return digitalAudio; } virtual void settingsChange(SettingsChange change); |