diff options
| author | xians@chromium.org <xians@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-13 15:22:45 +0000 |
|---|---|---|
| committer | xians@chromium.org <xians@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-13 15:22:45 +0000 |
| commit | 25d7f892987164fe8efe6f5f516f8d43cd6c2319 (patch) | |
| tree | 24f6a3643019bde3a7d8b3ce174b77fe1c9edc4f /media/audio/cras | |
| parent | 39df542c2a4e3c79c14049bf377adbed77e6289e (diff) | |
| download | chromium_src-25d7f892987164fe8efe6f5f516f8d43cd6c2319.zip chromium_src-25d7f892987164fe8efe6f5f516f8d43cd6c2319.tar.gz chromium_src-25d7f892987164fe8efe6f5f516f8d43cd6c2319.tar.bz2 | |
Reland 153623004: Remove the unified IO code on the browser
Remove the unified IO code on the browser.
Unified IO is not used any more and it should be removed.
TBR=dalecurtis@chromium.org
BUG=337096
TEST=bots, and nothing breaks.
Review URL: https://codereview.chromium.org/163343002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@251018 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/audio/cras')
| -rw-r--r-- | media/audio/cras/audio_manager_cras.cc | 3 | ||||
| -rw-r--r-- | media/audio/cras/audio_manager_cras.h | 3 | ||||
| -rw-r--r-- | media/audio/cras/cras_unified_unittest.cc | 5 |
3 files changed, 4 insertions, 7 deletions
diff --git a/media/audio/cras/audio_manager_cras.cc b/media/audio/cras/audio_manager_cras.cc index 305d5e8..ee7cc9c 100644 --- a/media/audio/cras/audio_manager_cras.cc +++ b/media/audio/cras/audio_manager_cras.cc @@ -79,8 +79,7 @@ AudioOutputStream* AudioManagerCras::MakeLinearOutputStream( AudioOutputStream* AudioManagerCras::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(dgreid): Open the correct input device for unified IO. diff --git a/media/audio/cras/audio_manager_cras.h b/media/audio/cras/audio_manager_cras.h index b2863a6..a9abd6c 100644 --- a/media/audio/cras/audio_manager_cras.h +++ b/media/audio/cras/audio_manager_cras.h @@ -35,8 +35,7 @@ class MEDIA_EXPORT AudioManagerCras : 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( diff --git a/media/audio/cras/cras_unified_unittest.cc b/media/audio/cras/cras_unified_unittest.cc index ee36b10..9d282bb 100644 --- a/media/audio/cras/cras_unified_unittest.cc +++ b/media/audio/cras/cras_unified_unittest.cc @@ -37,10 +37,9 @@ class MockAudioManagerCras : public AudioManagerCras { MOCK_METHOD0(HasAudioInputDevices, bool()); MOCK_METHOD1(MakeLinearOutputStream, AudioOutputStream*( const AudioParameters& params)); - MOCK_METHOD3(MakeLowLatencyOutputStream, + 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(MakeLinearOutputStream, AudioInputStream*( const AudioParameters& params, const std::string& device_id)); MOCK_METHOD2(MakeLowLatencyInputStream, AudioInputStream*( |