Move FilterType into MediaFilterCollection

media/tools/player_wtl/movie.cc

-// Copyright (c) 2010 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.
+// Copyright (c) 2010 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/utf_string_conversions.h"
 #include "media/base/pipeline_impl.h"
 #include "media/filters/audio_renderer_impl.h"
 #include "media/filters/ffmpeg_audio_decoder.h"
 #include "media/filters/ffmpeg_demuxer.h"
 #include "media/filters/ffmpeg_video_decoder.h"
 #include "media/filters/file_data_source.h"
@@ skipping 34 matching lines @@
 }
 
 bool Movie::Open(const wchar_t* url, WtlVideoRenderer* video_renderer) {
   // Close previous movie.
   if (pipeline_) {
     Close();
   }
 
   // Create filter collection.
   scoped_ptr<MediaFilterCollection> collection(new MediaFilterCollection());
-  collection->AddFilter(new FileDataSource());
-  collection->AddFilter(new FFmpegAudioDecoder());
-  collection->AddFilter(new FFmpegDemuxer());
-  collection->AddFilter(new FFmpegVideoDecoder(NULL));
+  collection->AddDataSource(new FileDataSource());
+  collection->AddAudioDecoder(new FFmpegAudioDecoder());
+  collection->AddDemuxer(new FFmpegDemuxer());
+  collection->AddVideoDecoder(new FFmpegVideoDecoder(NULL));
 
   if (enable_audio_) {
-    collection->AddFilter(new AudioRendererImpl());
+    collection->AddAudioRenderer(new AudioRendererImpl());
   } else {
-    collection->AddFilter(new media::NullAudioRenderer());
+    collection->AddAudioRenderer(new media::NullAudioRenderer());
   }
-  collection->AddFilter(video_renderer);
+  collection->AddVideoRenderer(video_renderer);
 
   thread_.reset(new base::Thread("PipelineThread"));
   thread_->Start();
   pipeline_ = new PipelineImpl(thread_->message_loop());
 
   // Create and start our pipeline.
   pipeline_->Start(collection.release(), WideToUTF8(std::wstring(url)), NULL);
   while (true) {
     PlatformThread::Sleep(100);
     if (pipeline_->IsInitialized())
@@ skipping 82 matching lines @@
 void Movie::Close() {
   if (pipeline_) {
     pipeline_->Stop(NULL);
     thread_->Stop();
     pipeline_ = NULL;
     thread_.reset();
   }
 }
 
 }  // namespace media