[Pkg-voip-commits] r7054 - in /qutecom/trunk/debian: changelog patches/generic/fix-alsa-mixer.patch patches/series

[cavedon-guest at alioth.debian.org]

Author: cavedon-guest
Date: Sat Apr 25 22:55:14 2009
New Revision: 7054

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=7054
Log:
Add generic/fix-alsa-mixer.patch: fix handling of audio mixer devices.

Added:
    qutecom/trunk/debian/patches/generic/fix-alsa-mixer.patch   (with props)
Modified:
    qutecom/trunk/debian/changelog
    qutecom/trunk/debian/patches/series

Modified: qutecom/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/trunk/debian/changelog?rev=7054&op=diff
==============================================================================
--- qutecom/trunk/debian/changelog (original)
+++ qutecom/trunk/debian/changelog Sat Apr 25 22:55:14 2009
@@ -6,9 +6,10 @@
   * Add head/fix-ringing.patch (LP: #364907)
   * Add generic/fix-ring-pulseaudio.patch: fix notification sounds when
     pulseaudio is used.
+  * Add generic/fix-alsa-mixer.patch: fix handling of audio mixer devices.
   * Allow DM upload.
 
- -- Ludovico Cavedon <ludovico.cavedon at gmail.com>  Fri, 24 Apr 2009 18:59:58 -0700
+ -- Ludovico Cavedon <ludovico.cavedon at gmail.com>  Sat, 25 Apr 2009 15:54:04 -0700
 
 qutecom (2.2~rc3.dfsg1-5) unstable; urgency=low
 

Added: qutecom/trunk/debian/patches/generic/fix-alsa-mixer.patch
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/trunk/debian/patches/generic/fix-alsa-mixer.patch?rev=7054&op=file
==============================================================================
--- qutecom/trunk/debian/patches/generic/fix-alsa-mixer.patch (added)
+++ qutecom/trunk/debian/patches/generic/fix-alsa-mixer.patch Sat Apr 25 22:55:14 2009
@@ -1,0 +1,30 @@
+Index: qutecom-2.2~rc3.dfsg1/libs/sound/src/linux/LinuxVolumeControl.cpp
+===================================================================
+--- qutecom-2.2~rc3.dfsg1.orig/libs/sound/src/linux/LinuxVolumeControl.cpp	2009-04-24 19:59:30.000000000 -0700
++++ qutecom-2.2~rc3.dfsg1/libs/sound/src/linux/LinuxVolumeControl.cpp	2009-04-24 20:27:21.000000000 -0700
+@@ -52,10 +52,10 @@
+ 	int level;
+ 	// TODO: retrieve the sound card name from the AudioDevice
+ 	if (_strDeviceType == "pcm") {
+-		get_mixer_level("hw:0", PCM_VOLUME, &level);
++		get_mixer_level("default", MASTER_VOLUME, &level);
+ 		return level;
+ 	} else if (_strDeviceType == "capture") {
+-		get_mixer_level("hw:0", CAPTURE_VOLUME, &level);
++		get_mixer_level("default", CAPTURE_VOLUME, &level);
+ 		return level;
+ 	}
+ 	return -1;
+@@ -64,10 +64,10 @@
+ bool LinuxVolumeControl::setLevel(unsigned level) {
+ 	// TODO: retrieve the sound card name from the AudioDevice
+ 	if (_strDeviceType == "pcm") {
+-		return set_mixer_level("hw:0", PCM_VOLUME, level);
++		return set_mixer_level("default", MASTER_VOLUME, level);
+ 		return level;
+ 	} else if (_strDeviceType == "capture") {
+-		return set_mixer_level("hw:0", CAPTURE_VOLUME, level);
++		return set_mixer_level("default", CAPTURE_VOLUME, level);
+ 	}
+ 	return false;
+ }

Propchange: qutecom/trunk/debian/patches/generic/fix-alsa-mixer.patch
------------------------------------------------------------------------------
    svn:mergeinfo = 

Modified: qutecom/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/trunk/debian/patches/series?rev=7054&op=diff
==============================================================================
--- qutecom/trunk/debian/patches/series (original)
+++ qutecom/trunk/debian/patches/series Sat Apr 25 22:55:14 2009
@@ -11,6 +11,7 @@
 generic/libpurple_debug.patch
 #generic/accept_certificate.patch
 generic/fix-ring-pulseaudio.patch
+generic/fix-alsa-mixer.patch
 debian/cmake-noavformat.patch
 debian/remove-extra-copying-file.patch
 debian/cmake-force-fpic.patch