Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(495)

Side by Side Diff: trunk/src/media/audio/mock_audio_manager.cc

Issue 300143005: Revert 272884 "reland 260073013: Added automatic mode to FakeInp..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « trunk/src/media/audio/fake_audio_input_stream.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "media/audio/mock_audio_manager.h" 5 #include "media/audio/mock_audio_manager.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/single_thread_task_runner.h" 8 #include "base/single_thread_task_runner.h"
9 #include "media/audio/audio_parameters.h" 9 #include "media/audio/audio_parameters.h"
10 10
(...skipping 16 matching lines...) Expand all
27 27
28 base::string16 MockAudioManager::GetAudioInputDeviceModel() { 28 base::string16 MockAudioManager::GetAudioInputDeviceModel() {
29 return base::string16(); 29 return base::string16();
30 } 30 }
31 31
32 void MockAudioManager::ShowAudioInputSettings() { 32 void MockAudioManager::ShowAudioInputSettings() {
33 } 33 }
34 34
35 void MockAudioManager::GetAudioInputDeviceNames( 35 void MockAudioManager::GetAudioInputDeviceNames(
36 AudioDeviceNames* device_names) { 36 AudioDeviceNames* device_names) {
37 // Do not inject fake devices here, use 37 DCHECK(device_names->empty());
38 // AudioInputDeviceManager::GetFakeDeviceNames() instead. 38 device_names->push_back(media::AudioDeviceName("fake_device_name_1",
39 "fake_device_id_1"));
40 device_names->push_back(media::AudioDeviceName("fake_device_name_2",
41 "fake_device_id_2"));
39 } 42 }
40 43
41 void MockAudioManager::GetAudioOutputDeviceNames( 44 void MockAudioManager::GetAudioOutputDeviceNames(
42 AudioDeviceNames* device_names) { 45 AudioDeviceNames* device_names) {
43 } 46 }
44 47
45 media::AudioOutputStream* MockAudioManager::MakeAudioOutputStream( 48 media::AudioOutputStream* MockAudioManager::MakeAudioOutputStream(
46 const media::AudioParameters& params, 49 const media::AudioParameters& params,
47 const std::string& device_id) { 50 const std::string& device_id) {
48 NOTREACHED(); 51 NOTREACHED();
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 const std::string& input_device_id) { 101 const std::string& input_device_id) {
99 return std::string(); 102 return std::string();
100 } 103 }
101 104
102 scoped_ptr<AudioLog> MockAudioManager::CreateAudioLog( 105 scoped_ptr<AudioLog> MockAudioManager::CreateAudioLog(
103 AudioLogFactory::AudioComponent component) { 106 AudioLogFactory::AudioComponent component) {
104 return scoped_ptr<AudioLog>(); 107 return scoped_ptr<AudioLog>();
105 } 108 }
106 109
107 } // namespace media. 110 } // namespace media.
OLDNEW
« no previous file with comments | « trunk/src/media/audio/fake_audio_input_stream.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698