From cb8715660d2879a3d0061016ba7d95f0c7ecb29f Mon Sep 17 00:00:00 2001 From: "xians@google.com" Date: Fri, 10 Jun 2011 12:01:25 +0000 Subject: [PATCH] take away some compiling warnings. git-svn-id: http://webrtc.googlecode.com/svn/trunk@66 4adac7df-926f-26a2-2b94-8c16560cd09d --- .../main/test/audio_device_test_func.cc | 11 ++-- .../main/test/func_test_manager.cc | 66 +++++++++---------- 2 files changed, 40 insertions(+), 37 deletions(-) diff --git a/modules/audio_device/main/test/audio_device_test_func.cc b/modules/audio_device/main/test/audio_device_test_func.cc index 402877fe63..d8b3582d3b 100644 --- a/modules/audio_device/main/test/audio_device_test_func.cc +++ b/modules/audio_device/main/test/audio_device_test_func.cc @@ -126,10 +126,13 @@ SHOW_MENU: case 12: testType = TTLoopback; break; - case 14: - testType = TTMobileAPI; - break; - case 66: + case 13: + testType = TTDeviceRemoval; + break; + case 14: + testType = TTMobileAPI; + break; + case 66: testType = TTTest; break; default: diff --git a/modules/audio_device/main/test/func_test_manager.cc b/modules/audio_device/main/test/func_test_manager.cc index 09d3d17c18..9772af454e 100644 --- a/modules/audio_device/main/test/func_test_manager.cc +++ b/modules/audio_device/main/test/func_test_manager.cc @@ -1272,7 +1272,7 @@ WebRtc_Word32 FuncTestManager::TestAudioTransport() if (audioDevice->Playing()) { TEST_LOG("\n> Listen to the file being played (fs=%d) out " - "and verify that the audio quality is OK.\n " + "and verify that the audio quality is OK.\n" "> Press any key to stop playing...\n \n", samplesPerSec); PAUSE(DEFAULT_PAUSE_TIME); @@ -2005,12 +2005,12 @@ WebRtc_Word32 FuncTestManager::TestMicrophoneBoost() if (audioDevice->Recording() && audioDevice->Playing()) { TEST_LOG("\n> Speak into the microphone and verify that the selected " - "microphone boost control is toggled between [BOOST ON] and [BOOST OFF].\n\ - > You should hear your own voice with an increased volume level " - "during the 'BOOST ON' periods.\n \n\ - > After a finalized test (and if file recording was enabled) verify" - " the recorded result off line.\n\ - > Press any key to stop...\n \n"); + "microphone boost control is toggled between [BOOST ON] and [BOOST OFF].\n" + "> You should hear your own voice with an increased volume level " + "during the 'BOOST ON' periods.\n \n" + "> After a finalized test (and if file recording was enabled) verify" + " the recorded result off line.\n" + "> Press any key to stop...\n \n"); PAUSE(DEFAULT_PAUSE_TIME); } @@ -2142,12 +2142,12 @@ WebRtc_Word32 FuncTestManager::TestMicrophoneAGC() if (audioDevice->Recording() && audioDevice->Playing()) { TEST_LOG("\n> Speak into the microphone and verify that the volume of" - " the selected microphone is varied between [~0] and [~MAX].\n\ - > You should hear your own voice with an increasing volume level" - " correlated to an emulated AGC setting.\n\ - > After a finalized test (and if file recording was enabled) verify" - " the recorded result off line.\n\ - > Press any key to stop...\n \n"); + " the selected microphone is varied between [~0] and [~MAX].\n" + "> You should hear your own voice with an increasing volume level" + " correlated to an emulated AGC setting.\n" + "> After a finalized test (and if file recording was enabled) verify" + " the recorded result off line.\n" + "> Press any key to stop...\n \n"); PAUSE(DEFAULT_PAUSE_TIME); } @@ -2404,14 +2404,14 @@ WebRtc_Word32 FuncTestManager::TestDeviceRemoval() if (audioLayer == AudioDeviceModule::kLinuxPulseAudio) { - TEST_LOG("\n \n> PulseAudio loopback audio is now active.\n\ - > Rec : fs=%u, #channels=%u.\n\ - > Play: fs=%u, #channels=%u.\n\ - > Speak into the microphone and verify that your voice is" - " played out in loopback.\n\ - > Unplug the device and make sure that your voice is played" - " out in loop back on the built-in soundcard.\n\ - > Then press any key...\n", + TEST_LOG("\n \n> PulseAudio loopback audio is now active.\n" + "> Rec : fs=%u, #channels=%u.\n" + "> Play: fs=%u, #channels=%u.\n" + "> Speak into the microphone and verify that your voice is" + " played out in loopback.\n" + "> Unplug the device and make sure that your voice is played" + " out in loop back on the built-in soundcard.\n" + "> Then press any key...\n", recSamplesPerSecRec, nRecChannels, playSamplesPerSec, nPlayChannels); @@ -2420,12 +2420,12 @@ WebRtc_Word32 FuncTestManager::TestDeviceRemoval() { if (loopCount < 1) { - TEST_LOG("\n \n> Loopback audio is now active.\n\ - > Rec : fs=%u, #channels=%u.\n\ - > Play: fs=%u, #channels=%u.\n\ - > Speak into the microphone and verify that your voice" - " is played out in loopback.\n\ - > Unplug the device and wait for the error message...\n", + TEST_LOG("\n \n> Loopback audio is now active.\n" + "> Rec : fs=%u, #channels=%u.\n" + "> Play: fs=%u, #channels=%u.\n" + "> Speak into the microphone and verify that your voice" + " is played out in loopback.\n" + "> Unplug the device and wait for the error message...\n", recSamplesPerSecRec, nRecChannels, playSamplesPerSec, nPlayChannels); @@ -2438,12 +2438,12 @@ WebRtc_Word32 FuncTestManager::TestDeviceRemoval() } } else { - TEST_LOG("\n \n> Loopback audio is now active.\n\ - > Rec : fs=%u, #channels=%u.\n\ - > Play: fs=%u, #channels=%u.\n\ - > Speak into the microphone and verify that your voice" - " is played out in loopback.\n\ - > Press any key to stop...\n", + TEST_LOG("\n \n> Loopback audio is now active.\n" + "> Rec : fs=%u, #channels=%u.\n" + "> Play: fs=%u, #channels=%u.\n" + "> Speak into the microphone and verify that your voice" + " is played out in loopback.\n" + "> Press any key to stop...\n", recSamplesPerSecRec, nRecChannels, playSamplesPerSec, nPlayChannels);