Hello community,
here is the log from the commit of package kdemultimedia3 for openSUSE:Factory
checked in at 2013-12-04 12:26:10
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kdemultimedia3 (Old)
and /work/SRC/openSUSE:Factory/.kdemultimedia3.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdemultimedia3"
Changes:
--------
--- /work/SRC/openSUSE:Factory/kdemultimedia3/kdemultimedia3.changes
2012-06-18 14:52:43.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.kdemultimedia3.new/kdemultimedia3.changes
2013-12-04 12:26:11.000000000 +0100
@@ -1,0 +2,6 @@
+Wed Dec 4 01:32:01 UTC 2013 - an...@opensuse.org
+
+- fix capture knobs, patch from trinity
+ kdemultimedia-alsa-capture-fix.diff
+
+-------------------------------------------------------------------
New:
----
kdemultimedia-alsa-capture-fix.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdemultimedia3.spec ++++++
--- /var/tmp/diff_new_pack.ClGjbZ/_old 2013-12-04 12:26:12.000000000 +0100
+++ /var/tmp/diff_new_pack.ClGjbZ/_new 2013-12-04 12:26:12.000000000 +0100
@@ -56,6 +56,7 @@
#Patch54: kdemultimedia-3.5.10-alt3.2-kmix.patch
Patch55: kdemultimedia-mmx-test.diff
Patch56: kdemultimedia-xine.patch
+Patch57: kdemultimedia-alsa-capture-fix.diff
%description
This package contains the base libraries for KDE multimedia programs.
@@ -236,6 +237,7 @@
#%patch54 -p1
%patch55 -p1
%patch56 -p1
+%patch57 -p1
rm -rf kappfinder-data
. /etc/opt/kde3/common_options
cp %SOURCE2 juk/pics/
++++++ kdemultimedia-alsa-capture-fix.diff ++++++
commit cf93ece4748db951ec0599dceb3569865ca333d3
Author: Timothy Pearson <kb9...@pearsoncomputing.net>
Date: 1365144710 -0500
Fix ALSA capture knob
This resolves Bug 1190
Thanks to Roman Savochenko for the patch!
diff --git a/kmix/mixer_alsa9.cpp b/kmix/mixer_alsa9.cpp
index e23e2b5..8f00c8d 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();
QPtrList<QString>& enumValuesRef = md->enumValues(); //
retrieve a ref
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
