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/tools | |
| 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/tools')
| -rw-r--r-- | media/tools/player_wtl/movie.h | 2 | ||||
| -rw-r--r-- | media/tools/player_x11/player_x11.cc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/media/tools/player_wtl/movie.h b/media/tools/player_wtl/movie.h index f6a3c44..54ddd49 100644 --- a/media/tools/player_wtl/movie.h +++ b/media/tools/player_wtl/movie.h @@ -85,7 +85,7 @@ class Movie { scoped_refptr<Pipeline> pipeline_; scoped_ptr<media::MessageLoopFactory> message_loop_factory_; - scoped_refptr<AudioManager> audio_manager_; + scoped_ptr<AudioManager> audio_manager_; bool enable_audio_; bool enable_draw_; diff --git a/media/tools/player_x11/player_x11.cc b/media/tools/player_x11/player_x11.cc index 3cbe6c6..8a80719 100644 --- a/media/tools/player_x11/player_x11.cc +++ b/media/tools/player_x11/player_x11.cc @@ -245,8 +245,8 @@ int main(int argc, char** argv) { return 1; } - scoped_refptr<AudioManager> audio_manager(AudioManager::Create()); - g_audio_manager = audio_manager; + scoped_ptr<AudioManager> audio_manager(AudioManager::Create()); + g_audio_manager = audio_manager.get(); logging::InitLogging( NULL, |