Move FilterType into MediaFilterCollection

media/tools/player_x11/player_x11.cc

Index: media/tools/player_x11/player_x11.cc
diff --git a/media/tools/player_x11/player_x11.cc b/media/tools/player_x11/player_x11.cc
index ad307c4891ef0ac3aae17e9fed35b4e0a278a315..ffff1bd92848a034b0d846379c15e5919ef79f66 100644
--- a/media/tools/player_x11/player_x11.cc
+++ b/media/tools/player_x11/player_x11.cc
@@ -99,21 +99,23 @@ bool InitPipeline(MessageLoop* message_loop,
   // Create our filter factories.
   scoped_ptr<media::MediaFilterCollection> collection(
       new media::MediaFilterCollection());
-  collection->AddFilter(new media::FileDataSource());
-  collection->AddFilter(new media::FFmpegDemuxer());
-  collection->AddFilter(new media::FFmpegAudioDecoder());
+  collection->AddDataSource(new media::FileDataSource());

[scherkus (not reviewing), 2010/11/11 19:33:35]

wow this code reads much nicer :)

+  collection->AddDemuxer(new media::FFmpegDemuxer());
+  collection->AddAudioDecoder(new media::FFmpegAudioDecoder());
   if (CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableOpenMax)) {
-    collection->AddFilter(new media::OmxVideoDecoder(NULL));
+    collection->AddVideoDecoder(new media::OmxVideoDecoder(NULL));
   } else {
-    collection->AddFilter(new media::FFmpegVideoDecoder(NULL));
+    collection->AddVideoDecoder(new media::FFmpegVideoDecoder(NULL));
   }
-  collection->AddFilter(new Renderer(g_display, g_window, paint_message_loop));
+  collection->AddVideoRenderer(new Renderer(g_display,
+                                            g_window,
+                                            paint_message_loop));
 
   if (enable_audio)
-    collection->AddFilter(new media::AudioRendererImpl());
+    collection->AddAudioRenderer(new media::AudioRendererImpl());
   else
-    collection->AddFilter(new media::NullAudioRenderer());
+    collection->AddAudioRenderer(new media::NullAudioRenderer());
 
   // Creates the pipeline and start it.
   *pipeline = new media::PipelineImpl(message_loop);