Gentoo Archives: gentoo-commits

From: "Wulf Krueger (philantrop)" <philantrop@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in kde-base/kmix/files: kmix-3.5.8-198015_XF86Audio.patch digest-kmix-3.5.8-r1
Date: Tue, 20 Nov 2007 12:46:38
Message-Id: E1IuSUn-0008Pr-1d@stork.gentoo.org
philantrop    07/11/20 12:46:29

  Added:                kmix-3.5.8-198015_XF86Audio.patch
                        digest-kmix-3.5.8-r1
  Log:
  Added a patch to fix a problem with the XF86Audio* key handlers not working when there's no master channel (e. g. you have a mute key that stopped working in KDE). Fixes bug 198015. Thanks to Kelvie Wong for creating and submitting said patch.
  (Portage version: 2.1.3.19)

Revision  Changes    Path
1.1                  kde-base/kmix/files/kmix-3.5.8-198015_XF86Audio.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kmix/files/kmix-3.5.8-198015_XF86Audio.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kmix/files/kmix-3.5.8-198015_XF86Audio.patch?rev=1.1&content-type=text/plain

Index: kmix-3.5.8-198015_XF86Audio.patch
===================================================================
>From efbae8873fc7b2ffe366353a1bcd9623cf4975a3 Mon Sep 17 00:00:00 2001
From: Kelvie Wong <kelvie@××××.org> Date: Sat, 3 Nov 2007 21:39:49 -0700 Subject: [PATCH] Added a masterDeviceIndex dcop call that returns the device index of the master channel --- kmix/mixer.cpp | 5 +++++ kmix/mixer.h | 1 + kmix/mixerIface.h | 5 +++++ 3 files changed, 11 insertions(+), 0 deletions(-) diff --git a/kmix/mixer.cpp b/kmix/mixer.cpp index 2adb300..316625e 100644 --- a/kmix/mixer.cpp +++ b/kmix/mixer.cpp @@ -730,6 +730,11 @@ bool Mixer::masterMute() return true; } +// @dcop only +int Mixer::masterDeviceIndex() +{ + return masterDevice()->num(); +} bool Mixer::isRecordSource( int deviceidx ) { diff --git a/kmix/mixer.h b/kmix/mixer.h index 14c8a65..b6d0917 100644 --- a/kmix/mixer.h +++ b/kmix/mixer.h @@ -123,6 +123,7 @@ class Mixer : public QObject, virtual public MixerIface virtual long absoluteVolumeMax( int deviceidx ); virtual int volume( int deviceidx ); virtual int masterVolume(); + virtual int masterDeviceIndex(); virtual void setMute( int deviceidx, bool on ); virtual void setMasterMute( bool on ); diff --git a/kmix/mixerIface.h b/kmix/mixerIface.h index b2aafb2..6c8da9f 100644 --- a/kmix/mixerIface.h +++ b/kmix/mixerIface.h @@ -85,6 +85,11 @@ k_dcop: virtual bool masterMute()=0; /** + Returns the index of the master device + */ + virtual int masterDeviceIndex()=0; + + /** Makes the given device a record source. */ virtual void setRecordSource( int deviceidx, bool on )=0; -- 1.5.3.4 1.1 kde-base/kmix/files/digest-kmix-3.5.8-r1 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kmix/files/digest-kmix-3.5.8-r1?rev=1.1&view=markup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kmix/files/digest-kmix-3.5.8-r1?rev=1.1&content-type=text/plain Index: digest-kmix-3.5.8-r1 =================================================================== MD5 9f3c95231ea265b09f3010adb954ae30 kdemultimedia-3.5.8.tar.bz2 6316739 RMD160 5fcb8d282e2d49baca4daa9fb4e24b5216df92ee kdemultimedia-3.5.8.tar.bz2 6316739 SHA256 07fc79e38bd7d50a8e2b9910a5d78ef565557b2a746b31d5d440829e9f05b0c1 kdemultimedia-3.5.8.tar.bz2 6316739 -- gentoo-commits@g.o mailing list