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

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

Issue 14273018: Use the browser UI thread for audio on OSX. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix device listener. Created 7 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
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 <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 #include <utility> 10 #include <utility>
(...skipping 21 matching lines...) Expand all
32 class MEDIA_EXPORT AudioManagerBase : public AudioManager { 32 class MEDIA_EXPORT AudioManagerBase : public AudioManager {
33 public: 33 public:
34 // Name of the generic "default" device. 34 // Name of the generic "default" device.
35 static const char kDefaultDeviceName[]; 35 static const char kDefaultDeviceName[];
36 // Unique Id of the generic "default" device. 36 // Unique Id of the generic "default" device.
37 static const char kDefaultDeviceId[]; 37 static const char kDefaultDeviceId[];
38 38
39 virtual ~AudioManagerBase(); 39 virtual ~AudioManagerBase();
40 40
41 virtual scoped_refptr<base::MessageLoopProxy> GetMessageLoop() OVERRIDE; 41 virtual scoped_refptr<base::MessageLoopProxy> GetMessageLoop() OVERRIDE;
42 virtual scoped_refptr<base::MessageLoopProxy> GetWorkerLoop() OVERRIDE;
42 43
43 virtual string16 GetAudioInputDeviceModel() OVERRIDE; 44 virtual string16 GetAudioInputDeviceModel() OVERRIDE;
44 45
45 virtual void ShowAudioInputSettings() OVERRIDE; 46 virtual void ShowAudioInputSettings() OVERRIDE;
46 47
47 virtual void GetAudioInputDeviceNames( 48 virtual void GetAudioInputDeviceNames(
48 media::AudioDeviceNames* device_names) OVERRIDE; 49 media::AudioDeviceNames* device_names) OVERRIDE;
49 50
50 virtual AudioOutputStream* MakeAudioOutputStream( 51 virtual AudioOutputStream* MakeAudioOutputStream(
51 const AudioParameters& params) OVERRIDE; 52 const AudioParameters& params) OVERRIDE;
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
157 ObserverList<AudioDeviceListener> output_listeners_; 158 ObserverList<AudioDeviceListener> output_listeners_;
158 159
159 // Thread used to interact with audio streams created by this audio manager. 160 // Thread used to interact with audio streams created by this audio manager.
160 scoped_ptr<base::Thread> audio_thread_; 161 scoped_ptr<base::Thread> audio_thread_;
161 mutable base::Lock audio_thread_lock_; 162 mutable base::Lock audio_thread_lock_;
162 163
163 // The message loop of the audio thread this object runs on. Used for internal 164 // The message loop of the audio thread this object runs on. Used for internal
164 // tasks which run on the audio thread even after Shutdown() has been started 165 // tasks which run on the audio thread even after Shutdown() has been started
165 // and GetMessageLoop() starts returning NULL. 166 // and GetMessageLoop() starts returning NULL.
166 scoped_refptr<base::MessageLoopProxy> message_loop_; 167 scoped_refptr<base::MessageLoopProxy> message_loop_;
168 scoped_refptr<base::MessageLoopProxy> worker_loop_;
167 169
168 DISALLOW_COPY_AND_ASSIGN(AudioManagerBase); 170 DISALLOW_COPY_AND_ASSIGN(AudioManagerBase);
169 }; 171 };
170 172
171 } // namespace media 173 } // namespace media
172 174
173 #endif // MEDIA_AUDIO_AUDIO_MANAGER_BASE_H_ 175 #endif // MEDIA_AUDIO_AUDIO_MANAGER_BASE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698