[Pkg-voip-commits] r4597 - in /wengophone/trunk/debian: changelog patches/head/alsa-plughw-default.patch

[cavedon-guest at alioth.debian.org]

Author: cavedon-guest
Date: Sat Sep 22 22:01:25 2007
New Revision: 4597

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=4597
Log:
head/alsa-plughw-default.patch (use dmix plugin to get non-exclusive access to hardware)

Modified:
    wengophone/trunk/debian/changelog
    wengophone/trunk/debian/patches/head/alsa-plughw-default.patch

Modified: wengophone/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/wengophone/trunk/debian/changelog?rev=4597&op=diff
==============================================================================
--- wengophone/trunk/debian/changelog (original)
+++ wengophone/trunk/debian/changelog Sat Sep 22 22:01:25 2007
@@ -16,12 +16,14 @@
       after core dump)
     - generic/memory-dump-tmp-path.patch (create core dumps in
       WENGOPHONE_COREDUMP_DIR, TMPDIR, or /tmp)
+    - head/alsa-plughw-default.patch (use dmix plugin to get non-exclusive
+      access to hardware)
   * Re-enable video support
   * Added patch generic/phapi-fix-crash-missing-codec.patch to avoid crash if
     video codec is not available in ffmpeg
-  * Added "Homepage:" tag in description (Developer's Reference, 6.2.4) 
-
- -- Ludovico Cavedon <cavedon at sssup.it>  Sat, 22 Sep 2007 22:57:39 +0200
+  * Added "Homepage:" tag in description (Developer's Reference, 6.2.4)
+
+ -- Ludovico Cavedon <cavedon at sssup.it>  Sat, 22 Sep 2007 23:58:10 +0200
 
 wengophone (2.1.1.dfsg0-4) unstable; urgency=low
 

Modified: wengophone/trunk/debian/patches/head/alsa-plughw-default.patch
URL: http://svn.debian.org/wsvn/pkg-voip/wengophone/trunk/debian/patches/head/alsa-plughw-default.patch?rev=4597&op=diff
==============================================================================
--- wengophone/trunk/debian/patches/head/alsa-plughw-default.patch (original)
+++ wengophone/trunk/debian/patches/head/alsa-plughw-default.patch Sat Sep 22 22:01:25 2007
@@ -1,7 +1,7 @@
-Index: wengophone-2.1.1.dfsg0/libs/sound/src/linux/AudioDeviceManager.cpp
+Index: wengophone-2.1.2.dfsg0/libs/sound/src/linux/AudioDeviceManager.cpp
 ===================================================================
---- wengophone-2.1.1.dfsg0.orig/libs/sound/src/linux/AudioDeviceManager.cpp	2007-08-16 12:27:41.000000000 +0200
-+++ wengophone-2.1.1.dfsg0/libs/sound/src/linux/AudioDeviceManager.cpp	2007-08-16 12:27:45.000000000 +0200
+--- wengophone-2.1.2.dfsg0.orig/libs/sound/src/linux/AudioDeviceManager.cpp	2007-04-20 16:06:36.000000000 +0200
++++ wengophone-2.1.2.dfsg0/libs/sound/src/linux/AudioDeviceManager.cpp	2007-09-22 23:57:08.000000000 +0200
 @@ -28,39 +28,19 @@
  std::list<AudioDevice> AudioDeviceManager::getInputDeviceList() {
  	RecursiveMutex::ScopedLock scopedLock(_mutex);
@@ -46,23 +46,22 @@
  }
  
  AudioDevice AudioDeviceManager::getDefaultOutputDevice() {
-@@ -131,7 +111,7 @@
- 		////
- 
- 		// open the sound card
--		if( snd_ctl_open(&snd_ctl, alsa_card_name, 0 ) < 0 )
-+		if ( snd_ctl_open(&snd_ctl, alsa_card_name, 0 ) < 0 )
- 		{
- 			LOG_WARN("unable to open card: " + String(alsa_card_name));
- 			break;
-@@ -165,8 +145,8 @@
+@@ -165,8 +145,16 @@
  			int has_playback = 0;
  
  			// compute internal device name
 -			snprintf(alsa_device_name, sizeof(alsa_device_name), "%s:%d,%d", "hw",
 -			card_index, device_index);
-+			snprintf(alsa_device_name, sizeof(alsa_device_name), "%s:%d,%d",
-+				"plughw", card_index, device_index);
++			if (input)
++			{
++				snprintf(alsa_device_name, sizeof(alsa_device_name), "%s:%d,%d",
++					"plughw", card_index, device_index);
++			}
++			else
++			{
++				snprintf(alsa_device_name, sizeof(alsa_device_name), "%s:%d",
++					"plug:dmix", card_index);
++			}
  			LOG_DEBUG("alsa_device_name: " + String(alsa_device_name));
  			////