summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-04-05 01:51:50 -0500
committerSlávek Banko <slavek.banko@axis.cz>2013-04-05 15:37:57 +0200
commita4c1404ca89260fe6ff3e46faa5ac858a82f16ba (patch)
tree41cc45295898fc09c4c1233d67356d80e73df0fb
parent08430ad5eb93d33670292428c59bcd544d7d2fe5 (diff)
downloadtdemultimedia-a4c1404ca89260fe6ff3e46faa5ac858a82f16ba.tar.gz
tdemultimedia-a4c1404ca89260fe6ff3e46faa5ac858a82f16ba.zip
Fix ALSA capture knob
This resolves Bug 1190 Thanks to Roman Savochenko for the patch! (cherry picked from commit cf93ece4748db951ec0599dceb3569865ca333d3)
-rw-r--r--kmix/mixer_alsa9.cpp16
1 files changed, 2 insertions, 14 deletions
diff --git a/kmix/mixer_alsa9.cpp b/kmix/mixer_alsa9.cpp
index 6c8c1783..4666b01a 100644
--- a/kmix/mixer_alsa9.cpp
+++ b/kmix/mixer_alsa9.cpp
@@ -305,8 +305,8 @@ Mixer_ALSA::open()
} // is ordinary mixer element (NOT an enum)
MixDevice* md = new MixDevice( mixerIdx,
- *volPlay,
- canRecord,
+ canCapture ? *volCapture : *volPlay,
+ canCapture ? true : canRecord,
canMute,
snd_mixer_selem_id_get_name( sid ),
ct,
@@ -321,18 +321,6 @@ Mixer_ALSA::open()
masterChosen = true;
}
- if ( canCapture && !canRecord ) {
- MixDevice *mdCapture =
- new MixDevice( mixerIdx,
- *volCapture,
- true,
- canMute,
- snd_mixer_selem_id_get_name( sid ),
- ct,
- cc );
- m_mixDevices.append( mdCapture );
- }
-
if ( enumList.count() > 0 ) {
int maxEnumId= enumList.count();
TQPtrList<TQString>& enumValuesRef = md->enumValues(); // retrieve a ref