From 630504fddf987f01f21ee963c3d32af1c10ee955 Mon Sep 17 00:00:00 2001 From: "zakkhoyt@google.com" Date: Wed, 13 Jul 2011 20:06:58 +0000 Subject: [PATCH] Reverting svn changes. Moving to gcl system. git-svn-id: http://webrtc.googlecode.com/svn/trunk@202 4adac7df-926f-26a2-2b94-8c16560cd09d --- .../main/source/Linux/audio_device_linux_pulse.cc | 2 +- .../main/source/voe_volume_control_impl.cc | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 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 013a290c5..7d3942b6b 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 (i->monitor_of_sink == PA_INVALID_INDEX) + if (!strncmp(i->name, "alsa_input", 10)) { 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 b3f03e250..b55b3956c 100644 --- a/src/voice_engine/main/source/voe_volume_control_impl.cc +++ b/src/voice_engine/main/source/voe_volume_control_impl.cc @@ -399,6 +399,9 @@ int VoEVolumeControlImpl::GetSpeechInputLevel(unsigned int& level) { WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_instanceId,-1), "GetSpeechInputLevel()"); + ANDROID_NOT_SUPPORTED(); + IPHONE_NOT_SUPPORTED(); + if (!_engineStatistics.Initialized()) { _engineStatistics.SetLastError(VE_NOT_INITED, kTraceError); @@ -415,7 +418,10 @@ int VoEVolumeControlImpl::GetSpeechOutputLevel(int channel, unsigned int& level) { WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_instanceId,-1), - "GetSpeechOutputLevel(channel=%d, level=?)", channel); + "GetSpeechOutputLevel(channel=%d, level=?)", channel); + ANDROID_NOT_SUPPORTED(); + IPHONE_NOT_SUPPORTED(); + if (!_engineStatistics.Initialized()) { _engineStatistics.SetLastError(VE_NOT_INITED, kTraceError); @@ -445,6 +451,8 @@ 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); @@ -462,6 +470,8 @@ 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);