generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Reverting svn changes. Moving to gcl system.

Browse Source 
git-svn-id: http://webrtc.googlecode.com/svn/trunk@202 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
zakkhoyt@google.com 2011-07-13 20:06:58 +00:00
parent 81f76937f4
commit 630504fddf
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/modules/audio_device/main/source/Linux/audio_device_linux_pulse.cc
View File

@ -2046,7 +2046,7 @@ void AudioDeviceLinuxPulse::PaSourceInfoCallbackHandler(
} }
// We don't want to list output devices // 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) if (_numRecDevices == _deviceIndex)
{ {

10
src/voice_engine/main/source/voe_volume_control_impl.cc
View File

@ -399,6 +399,9 @@ int VoEVolumeControlImpl::GetSpeechInputLevel(unsigned int& level)
{ {
WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_instanceId,-1), WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_instanceId,-1),
"GetSpeechInputLevel()"); "GetSpeechInputLevel()");
ANDROID_NOT_SUPPORTED();
IPHONE_NOT_SUPPORTED();
if (!_engineStatistics.Initialized()) if (!_engineStatistics.Initialized())
{ {
_engineStatistics.SetLastError(VE_NOT_INITED, kTraceError); _engineStatistics.SetLastError(VE_NOT_INITED, kTraceError);
@ -416,6 +419,9 @@ int VoEVolumeControlImpl::GetSpeechOutputLevel(int channel,
{ {
WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_instanceId,-1), 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()) if (!_engineStatistics.Initialized())
{ {
_engineStatistics.SetLastError(VE_NOT_INITED, kTraceError); _engineStatistics.SetLastError(VE_NOT_INITED, kTraceError);
@ -445,6 +451,8 @@ int VoEVolumeControlImpl::GetSpeechInputLevelFullRange(unsigned int& level)
{ {
WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_instanceId,-1), WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_instanceId,-1),
"GetSpeechInputLevelFullRange(level=?)"); "GetSpeechInputLevelFullRange(level=?)");
ANDROID_NOT_SUPPORTED();
IPHONE_NOT_SUPPORTED();
if (!_engineStatistics.Initialized()) if (!_engineStatistics.Initialized())
{ {
_engineStatistics.SetLastError(VE_NOT_INITED, kTraceError); _engineStatistics.SetLastError(VE_NOT_INITED, kTraceError);
@ -462,6 +470,8 @@ int VoEVolumeControlImpl::GetSpeechOutputLevelFullRange(int channel,
{ {
WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_instanceId,-1), WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_instanceId,-1),
"GetSpeechOutputLevelFullRange(channel=%d, level=?)", channel); "GetSpeechOutputLevelFullRange(channel=%d, level=?)", channel);
ANDROID_NOT_SUPPORTED();
IPHONE_NOT_SUPPORTED();
if (!_engineStatistics.Initialized()) if (!_engineStatistics.Initialized())
{ {
_engineStatistics.SetLastError(VE_NOT_INITED, kTraceError); _engineStatistics.SetLastError(VE_NOT_INITED, kTraceError);