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

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

Issue 190553004: Revert "Attempt to fix audio wedges by restarting all streams on OSX." (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 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 | « 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 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 108
109 virtual AudioParameters GetInputStreamParameters( 109 virtual AudioParameters GetInputStreamParameters(
110 const std::string& device_id) OVERRIDE; 110 const std::string& device_id) OVERRIDE;
111 111
112 virtual std::string GetAssociatedOutputDeviceID( 112 virtual std::string GetAssociatedOutputDeviceID(
113 const std::string& input_device_id) OVERRIDE; 113 const std::string& input_device_id) OVERRIDE;
114 114
115 virtual scoped_ptr<AudioLog> CreateAudioLog( 115 virtual scoped_ptr<AudioLog> CreateAudioLog(
116 AudioLogFactory::AudioComponent component) OVERRIDE; 116 AudioLogFactory::AudioComponent component) OVERRIDE;
117 117
118 virtual void FixWedgedAudio() OVERRIDE;
119
120 protected: 118 protected:
121 AudioManagerBase(AudioLogFactory* audio_log_factory); 119 AudioManagerBase(AudioLogFactory* audio_log_factory);
122 120
123 // Shuts down the audio thread and releases all the audio output dispatchers 121 // Shuts down the audio thread and releases all the audio output dispatchers
124 // on the audio thread. All audio streams should be freed before Shutdown() 122 // on the audio thread. All audio streams should be freed before Shutdown()
125 // is called. This must be called in the destructor of every AudioManagerBase 123 // is called. This must be called in the destructor of every AudioManagerBase
126 // implementation. 124 // implementation.
127 void Shutdown(); 125 void Shutdown();
128 126
129 void SetMaxOutputStreamsAllowed(int max) { max_num_output_streams_ = max; } 127 void SetMaxOutputStreamsAllowed(int max) { max_num_output_streams_ = max; }
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
195 193
196 // Proxy for creating AudioLog objects. 194 // Proxy for creating AudioLog objects.
197 AudioLogFactory* const audio_log_factory_; 195 AudioLogFactory* const audio_log_factory_;
198 196
199 DISALLOW_COPY_AND_ASSIGN(AudioManagerBase); 197 DISALLOW_COPY_AND_ASSIGN(AudioManagerBase);
200 }; 198 };
201 199
202 } // namespace media 200 } // namespace media
203 201
204 #endif // MEDIA_AUDIO_AUDIO_MANAGER_BASE_H_ 202 #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