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

Side by Side Diff: media/audio/audio_manager_base.h

Issue 23453022: Add AudioManager::GetAudioOutputDeviceNames and implement for pulseaudio. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@mediaCleanups
Patch Set: Add missing override. Created 7 years, 3 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
« no previous file with comments | « media/audio/audio_manager.h ('k') | media/audio/audio_manager_base.cc » ('j') | 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 #ifndef MEDIA_AUDIO_AUDIO_MANAGER_BASE_H_ 5 #ifndef MEDIA_AUDIO_AUDIO_MANAGER_BASE_H_
6 #define MEDIA_AUDIO_AUDIO_MANAGER_BASE_H_ 6 #define MEDIA_AUDIO_AUDIO_MANAGER_BASE_H_
7 7
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 10
(...skipping 29 matching lines...) Expand all
40 virtual ~AudioManagerBase(); 40 virtual ~AudioManagerBase();
41 41
42 virtual scoped_refptr<base::MessageLoopProxy> GetMessageLoop() OVERRIDE; 42 virtual scoped_refptr<base::MessageLoopProxy> GetMessageLoop() OVERRIDE;
43 virtual scoped_refptr<base::MessageLoopProxy> GetWorkerLoop() OVERRIDE; 43 virtual scoped_refptr<base::MessageLoopProxy> GetWorkerLoop() OVERRIDE;
44 44
45 virtual string16 GetAudioInputDeviceModel() OVERRIDE; 45 virtual string16 GetAudioInputDeviceModel() OVERRIDE;
46 46
47 virtual void ShowAudioInputSettings() OVERRIDE; 47 virtual void ShowAudioInputSettings() OVERRIDE;
48 48
49 virtual void GetAudioInputDeviceNames( 49 virtual void GetAudioInputDeviceNames(
50 media::AudioDeviceNames* device_names) OVERRIDE; 50 AudioDeviceNames* device_names) OVERRIDE;
51
52 virtual void GetAudioOutputDeviceNames(
53 AudioDeviceNames* device_names) OVERRIDE;
51 54
52 virtual AudioOutputStream* MakeAudioOutputStream( 55 virtual AudioOutputStream* MakeAudioOutputStream(
53 const AudioParameters& params, 56 const AudioParameters& params,
54 const std::string& device_id, 57 const std::string& device_id,
55 const std::string& input_device_id) OVERRIDE; 58 const std::string& input_device_id) OVERRIDE;
56 59
57 virtual AudioInputStream* MakeAudioInputStream( 60 virtual AudioInputStream* MakeAudioInputStream(
58 const AudioParameters& params, const std::string& device_id) OVERRIDE; 61 const AudioParameters& params, const std::string& device_id) OVERRIDE;
59 62
60 virtual AudioOutputStream* MakeAudioOutputStreamProxy( 63 virtual AudioOutputStream* MakeAudioOutputStreamProxy(
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
176 // Map of cached AudioOutputDispatcher instances. Must only be touched 179 // Map of cached AudioOutputDispatcher instances. Must only be touched
177 // from the audio thread (no locking). 180 // from the audio thread (no locking).
178 AudioOutputDispatchers output_dispatchers_; 181 AudioOutputDispatchers output_dispatchers_;
179 182
180 DISALLOW_COPY_AND_ASSIGN(AudioManagerBase); 183 DISALLOW_COPY_AND_ASSIGN(AudioManagerBase);
181 }; 184 };
182 185
183 } // namespace media 186 } // namespace media
184 187
185 #endif // MEDIA_AUDIO_AUDIO_MANAGER_BASE_H_ 188 #endif // MEDIA_AUDIO_AUDIO_MANAGER_BASE_H_
OLDNEW
« no previous file with comments | « media/audio/audio_manager.h ('k') | media/audio/audio_manager_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698