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 7d3942b6b..013a290c5 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 b55b3956c..b3f03e250 100644 --- a/src/voice_engine/main/source/voe_volume_control_impl.cc +++ b/src/voice_engine/main/source/voe_volume_control_impl.cc @@ -399,9 +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()) { _engineStatistics.SetLastError(VE_NOT_INITED, kTraceError); @@ -418,10 +415,7 @@ int VoEVolumeControlImpl::GetSpeechOutputLevel(int channel, unsigned int& level) { WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_instanceId,-1), - "GetSpeechOutputLevel(channel=%d, level=?)", channel); - ANDROID_NOT_SUPPORTED(); - IPHONE_NOT_SUPPORTED(); - + "GetSpeechOutputLevel(channel=%d, level=?)", channel); if (!_engineStatistics.Initialized()) { _engineStatistics.SetLastError(VE_NOT_INITED, kTraceError); @@ -451,8 +445,6 @@ 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 +462,6 @@ 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);