[Pkg-voip-commits] r4171 - in wengophone/trunk/debian/patches: . head
cavedon-guest at alioth.debian.org
cavedon-guest at alioth.debian.org
Mon Aug 20 16:06:32 UTC 2007
Author: cavedon-guest
Date: 2007-08-20 16:06:32 +0000 (Mon, 20 Aug 2007)
New Revision: 4171
Added:
wengophone/trunk/debian/patches/head/alsa-plughw-default.patch
Modified:
wengophone/trunk/debian/patches/series
Log:
Added patch head/alsa-plughw-default.patch to enable selection of additional
sound cards. Closes #435747
Added: wengophone/trunk/debian/patches/head/alsa-plughw-default.patch
===================================================================
--- wengophone/trunk/debian/patches/head/alsa-plughw-default.patch (rev 0)
+++ wengophone/trunk/debian/patches/head/alsa-plughw-default.patch 2007-08-20 16:06:32 UTC (rev 4171)
@@ -0,0 +1,68 @@
+Index: wengophone-2.1.1.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
+@@ -28,39 +28,19 @@
+ std::list<AudioDevice> AudioDeviceManager::getInputDeviceList() {
+ RecursiveMutex::ScopedLock scopedLock(_mutex);
+
+- //HACK: always return the default one + plughw
+- std::list<AudioDevice> deviceList;
+- deviceList.push_back(getDefaultInputDevice());
+-
+- StringList data;
+- data += String("ALSA: plughw");
+- data += String("plughw");
+- data += EnumDeviceType::toString(EnumDeviceType::DeviceTypeWaveIn);
+- deviceList.push_back(AudioDevice(data));
++ std::list<AudioDevice> deviceList = find_alsa_devices(1);
++ deviceList.push_front(getDefaultInputDevice());
+
+ return deviceList;
+- ////
+-
+- //return find_alsa_devices(1);
+ }
+
+ std::list<AudioDevice> AudioDeviceManager::getOutputDeviceList() {
+ RecursiveMutex::ScopedLock scopedLock(_mutex);
+
+- //HACK: always return the default one + plughw
+- std::list<AudioDevice> deviceList;
+- deviceList.push_back(getDefaultOutputDevice());
+-
+- StringList data;
+- data += String("ALSA: plughw");
+- data += String("plughw");
+- data += EnumDeviceType::toString(EnumDeviceType::DeviceTypeWaveOut);
+- deviceList.push_back(AudioDevice(data));
++ std::list<AudioDevice> deviceList = find_alsa_devices(0);
++ deviceList.push_front(getDefaultOutputDevice());
+
+ return deviceList;
+- ////
+-
+- //return find_alsa_devices(0);
+ }
+
+ 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 @@
+ 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);
+ LOG_DEBUG("alsa_device_name: " + String(alsa_device_name));
+ ////
+
Modified: wengophone/trunk/debian/patches/series
===================================================================
--- wengophone/trunk/debian/patches/series 2007-08-20 16:01:27 UTC (rev 4170)
+++ wengophone/trunk/debian/patches/series 2007-08-20 16:06:32 UTC (rev 4171)
@@ -1,5 +1,6 @@
head/phapi-disable-iLBC-codec.patch
head/qobjectthreadsafe-fix-qt42.patch
+head/alsa-plughw-default.patch
generic/cmake-fix-ENABLE_CRASHREPORT.patch
generic/cmake-static-coredumper.patch
generic/exosip-fix-empty-notify.patch
More information about the Pkg-voip-commits
mailing list