diff options
| author | xians@chromium.org <xians@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-07 21:32:50 +0000 |
|---|---|---|
| committer | xians@chromium.org <xians@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-07 21:32:50 +0000 |
| commit | e8ff1ad4a40d8f525a457b1231f31ff1068fc7a7 (patch) | |
| tree | 11aef20f75aab3889614f2b05f70fe7ffae92709 /media/audio/alsa | |
| parent | 1d62cf79f609fba47ef680bf5acc9b453d4229ea (diff) | |
| download | chromium_src-e8ff1ad4a40d8f525a457b1231f31ff1068fc7a7.zip chromium_src-e8ff1ad4a40d8f525a457b1231f31ff1068fc7a7.tar.gz chromium_src-e8ff1ad4a40d8f525a457b1231f31ff1068fc7a7.tar.bz2 | |
Remove the unified IO code on the browser.
Unified IO is not used any more and it should be removed.
BUG=337096
TEST=bots, and nothing breaks.
Review URL: https://codereview.chromium.org/153623004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@249790 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/audio/alsa')
| -rw-r--r-- | media/audio/alsa/alsa_output_unittest.cc | 5 | ||||
| -rw-r--r-- | media/audio/alsa/audio_manager_alsa.cc | 4 | ||||
| -rw-r--r-- | media/audio/alsa/audio_manager_alsa.h | 3 |
3 files changed, 4 insertions, 8 deletions
diff --git a/media/audio/alsa/alsa_output_unittest.cc b/media/audio/alsa/alsa_output_unittest.cc index 07ce8ea..8b0aeae 100644 --- a/media/audio/alsa/alsa_output_unittest.cc +++ b/media/audio/alsa/alsa_output_unittest.cc @@ -75,10 +75,9 @@ class MockAudioManagerAlsa : public AudioManagerAlsa { MOCK_METHOD0(HasAudioInputDevices, bool()); MOCK_METHOD1(MakeLinearOutputStream, AudioOutputStream*( const AudioParameters& params)); - MOCK_METHOD3(MakeLowLatencyOutputStream, AudioOutputStream*( + MOCK_METHOD2(MakeLowLatencyOutputStream, AudioOutputStream*( const AudioParameters& params, - const std::string& device_id, - const std::string& input_device_id)); + const std::string& device_id)); MOCK_METHOD2(MakeLowLatencyInputStream, AudioInputStream*( const AudioParameters& params, const std::string& device_id)); diff --git a/media/audio/alsa/audio_manager_alsa.cc b/media/audio/alsa/audio_manager_alsa.cc index ac61a5f..7d6421f 100644 --- a/media/audio/alsa/audio_manager_alsa.cc +++ b/media/audio/alsa/audio_manager_alsa.cc @@ -283,11 +283,9 @@ AudioOutputStream* AudioManagerAlsa::MakeLinearOutputStream( AudioOutputStream* AudioManagerAlsa::MakeLowLatencyOutputStream( const AudioParameters& params, - const std::string& device_id, - const std::string& input_device_id) { + const std::string& device_id) { DLOG_IF(ERROR, !device_id.empty()) << "Not implemented!"; DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format()); - // TODO(xians): Use input_device_id for unified IO. return MakeOutputStream(params); } diff --git a/media/audio/alsa/audio_manager_alsa.h b/media/audio/alsa/audio_manager_alsa.h index 155089f..d08c3ba 100644 --- a/media/audio/alsa/audio_manager_alsa.h +++ b/media/audio/alsa/audio_manager_alsa.h @@ -37,8 +37,7 @@ class MEDIA_EXPORT AudioManagerAlsa : public AudioManagerBase { const AudioParameters& params) OVERRIDE; virtual AudioOutputStream* MakeLowLatencyOutputStream( const AudioParameters& params, - const std::string& device_id, - const std::string& input_device_id) OVERRIDE; + const std::string& device_id) OVERRIDE; virtual AudioInputStream* MakeLinearInputStream( const AudioParameters& params, const std::string& device_id) OVERRIDE; virtual AudioInputStream* MakeLowLatencyInputStream( |