From 5e26663904d43852000b18cbb6fc6a207ef3abb8 Mon Sep 17 00:00:00 2001 From: "zakkhoyt@google.com" Date: Fri, 15 Jul 2011 18:21:34 +0000 Subject: [PATCH] Porting GTalk bugs: * http://b/issue?id=4442213 * http://b/issue?id=4354351 Review URL: http://webrtc-codereview.appspot.com/71003 git-svn-id: http://webrtc.googlecode.com/svn/trunk@216 4adac7df-926f-26a2-2b94-8c16560cd09d --- .../main/source/Linux/audio_device_linux_pulse.cc | 2 +- .../main/source/voe_volume_control_impl.cc | 10 ++-------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/src/modules/audio_device/main/source/Linux/audio_device_linux_pulse.cc b/src/modules/audio_device/main/source/Linux/audio_device_linux_pulse.cc index 7d3942b6b5..f13dc428ef 100644 --- a/src/modules/audio_device/main/source/Linux/audio_device_linux_pulse.cc +++ b/src/modules/audio_device/main/source/Linux/audio_device_linux_pulse.cc @@ -2046,7 +2046,7 @@ void AudioDeviceLinuxPulse::PaSourceInfoCallbackHandler( } // We don't want to list output devices - if (!strncmp(i->name, "alsa_input", 10)) + if (i->monitor_of_sink == PA_INVALID_INDEX) { if (_numRecDevices == _deviceIndex) { diff --git a/src/voice_engine/main/source/voe_volume_control_impl.cc b/src/voice_engine/main/source/voe_volume_control_impl.cc index b55b3956cb..a97f6fe8f9 100644 --- a/src/voice_engine/main/source/voe_volume_control_impl.cc +++ b/src/voice_engine/main/source/voe_volume_control_impl.cc @@ -399,8 +399,6 @@ int VoEVolumeControlImpl::GetSpeechInputLevel(unsigned int& level) { WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_instanceId,-1), "GetSpeechInputLevel()"); - ANDROID_NOT_SUPPORTED(); - IPHONE_NOT_SUPPORTED(); if (!_engineStatistics.Initialized()) { @@ -419,8 +417,6 @@ int VoEVolumeControlImpl::GetSpeechOutputLevel(int channel, { WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_instanceId,-1), "GetSpeechOutputLevel(channel=%d, level=?)", channel); - ANDROID_NOT_SUPPORTED(); - IPHONE_NOT_SUPPORTED(); if (!_engineStatistics.Initialized()) { @@ -451,8 +447,7 @@ int VoEVolumeControlImpl::GetSpeechInputLevelFullRange(unsigned int& level) { WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_instanceId,-1), "GetSpeechInputLevelFullRange(level=?)"); - ANDROID_NOT_SUPPORTED(); - IPHONE_NOT_SUPPORTED(); + if (!_engineStatistics.Initialized()) { _engineStatistics.SetLastError(VE_NOT_INITED, kTraceError); @@ -470,8 +465,7 @@ int VoEVolumeControlImpl::GetSpeechOutputLevelFullRange(int channel, { WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_instanceId,-1), "GetSpeechOutputLevelFullRange(channel=%d, level=?)", channel); - ANDROID_NOT_SUPPORTED(); - IPHONE_NOT_SUPPORTED(); + if (!_engineStatistics.Initialized()) { _engineStatistics.SetLastError(VE_NOT_INITED, kTraceError);