summaryrefslogtreecommitdiffstats
path: root/kmix
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-04-05 01:51:50 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-04-05 01:51:50 -0500
commitcf93ece4748db951ec0599dceb3569865ca333d3 (patch)
tree4c9223c67bc245acc51f77d2f8bf09f64ec835e3 /kmix
parent406cb9c0fa4444be96a8a729dae0428d1dae0885 (diff)
downloadtdemultimedia-cf93ece4748db951ec0599dceb3569865ca333d3.tar.gz
tdemultimedia-cf93ece4748db951ec0599dceb3569865ca333d3.zip
Fix ALSA capture knob
This resolves Bug 1190 Thanks to Roman Savochenko for the patch!
Diffstat (limited to 'kmix')
-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 e23e2b57..8f00c8d9 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