Remove the AudioManager singleton.

media/tools/player_wtl/movie.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/tools/player_wtl/movie.h"
 
 #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"
 #include "media/base/pipeline_impl.h"
 #include "media/filters/ffmpeg_audio_decoder.h"
 #include "media/filters/ffmpeg_demuxer_factory.h"
 #include "media/filters/ffmpeg_video_decoder.h"
 #include "media/filters/file_data_source_factory.h"
 #include "media/filters/null_audio_renderer.h"
 #include "media/filters/reference_audio_renderer.h"
 #include "media/tools/player_wtl/wtl_renderer.h"
 
 using media::FFmpegAudioDecoder;
 using media::FFmpegDemuxerFactory;
 using media::FFmpegVideoDecoder;
 using media::FileDataSourceFactory;
 using media::FilterCollection;
 using media::PipelineImpl;
 using media::ReferenceAudioRenderer;
 
 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),
       max_threads_(0),
       play_rate_(1.0f),
       movie_dib_(NULL),
       movie_hwnd_(0) {
 }
 
 Movie::~Movie() {
@@ skipping 27 matching lines @@
   // Create filter collection.
   scoped_ptr<FilterCollection> collection(new FilterCollection());
   collection->SetDemuxerFactory(new FFmpegDemuxerFactory(
       new FileDataSourceFactory(), pipeline_loop));
   collection->AddAudioDecoder(new FFmpegAudioDecoder(
       message_loop_factory_->GetMessageLoop("AudioDecoderThread")));
   collection->AddVideoDecoder(new FFmpegVideoDecoder(
       message_loop_factory_->GetMessageLoop("VideoDecoderThread")));
 
   if (enable_audio_) {
-    collection->AddAudioRenderer(new ReferenceAudioRenderer());
+    collection->AddAudioRenderer(
+        new ReferenceAudioRenderer(audio_manager_));
   } else {
     collection->AddAudioRenderer(new media::NullAudioRenderer());
   }
   collection->AddVideoRenderer(video_renderer);
 
   // Create and start our pipeline.
   media::PipelineStatusNotification note;
   pipeline_->Start(collection.release(), WideToUTF8(std::wstring(url)),
                    note.Callback());
   // Wait until the pipeline is fully initialized.
@@ skipping 81 matching lines @@
 void Movie::Close() {
   if (pipeline_) {
     pipeline_->Stop(media::PipelineStatusCB());
     pipeline_ = NULL;
   }
 
   message_loop_factory_.reset();
 }
 
 }  // namespace media