diff options
| author | tommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-15 17:35:04 +0000 |
|---|---|---|
| committer | tommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-15 17:35:04 +0000 |
| commit | 7b52361dd69914600e40db052cf7c4bf8671dba8 (patch) | |
| tree | 8fc761b27815f655840f5e9bf7d61b4868578119 /media/audio/audio_output_controller.h | |
| parent | 3dfc972e392157dc7f5e31b3530a98397c6a1a33 (diff) | |
| download | chromium_src-7b52361dd69914600e40db052cf7c4bf8671dba8.zip chromium_src-7b52361dd69914600e40db052cf7c4bf8671dba8.tar.gz chromium_src-7b52361dd69914600e40db052cf7c4bf8671dba8.tar.bz2 | |
Make AudioManager non-refcounted.
BUG=107087
TEST=media and content unit tests
Review URL: https://chromiumcodereview.appspot.com/9382040
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@122102 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/audio/audio_output_controller.h')
| -rw-r--r-- | media/audio/audio_output_controller.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/media/audio/audio_output_controller.h b/media/audio/audio_output_controller.h index 4105e15..42e8d5a 100644 --- a/media/audio/audio_output_controller.h +++ b/media/audio/audio_output_controller.h @@ -175,12 +175,11 @@ class MEDIA_EXPORT AudioOutputController static const int kPollNumAttempts; static const int kPollPauseInMilliseconds; - AudioOutputController(AudioManager* audio_manager, - EventHandler* handler, + AudioOutputController(EventHandler* handler, SyncReader* sync_reader); // The following methods are executed on the audio manager thread. - void DoCreate(const AudioParameters& params); + void DoCreate(AudioManager* audio_manager, const AudioParameters& params); void DoPlay(); void PollAndStartIfDataReady(); void DoPause(); @@ -196,7 +195,6 @@ class MEDIA_EXPORT AudioOutputController // Signals event when done if it is not NULL. void DoStopCloseAndClearStream(base::WaitableEvent *done); - scoped_refptr<AudioManager> audio_manager_; // |handler_| may be called only if |state_| is not kClosed. EventHandler* handler_; AudioOutputStream* stream_; |