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

Unified Diff: media/tools/player_wtl/movie.cc

Issue 8818012: Remove the AudioManager singleton. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Set svn eol properties for a couple of files Created 9 years 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/tools/player_wtl/movie.h ('k') | media/tools/player_x11/player_x11.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/tools/player_wtl/movie.cc
===================================================================
--- media/tools/player_wtl/movie.cc (revision 114012)
+++ media/tools/player_wtl/movie.cc (working copy)
@@ -7,6 +7,7 @@
#include "base/memory/singleton.h"
#include "base/threading/platform_thread.h"
#include "base/utf_string_conversions.h"
+#include "media/audio/audio_manager.h"
#include "media/base/filter_collection.h"
#include "media/base/media_log.h"
#include "media/base/message_loop_factory_impl.h"
@@ -30,7 +31,8 @@
namespace media {
Movie::Movie()
- : enable_audio_(true),
+ : audio_manager_(AudioManager::Create()),
+ enable_audio_(true),
enable_draw_(true),
enable_dump_yuv_file_(false),
enable_pause_(false),
@@ -78,7 +80,8 @@
message_loop_factory_->GetMessageLoop("VideoDecoderThread")));
if (enable_audio_) {
- collection->AddAudioRenderer(new ReferenceAudioRenderer());
+ collection->AddAudioRenderer(
+ new ReferenceAudioRenderer(audio_manager_));
} else {
collection->AddAudioRenderer(new media::NullAudioRenderer());
}
« no previous file with comments | « media/tools/player_wtl/movie.h ('k') | media/tools/player_x11/player_x11.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698