PipelineError is dead. Long live PipelineStatus!

media/tools/player_x11/player_x11.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 <iostream>
 #include <signal.h>
 #include <X11/keysym.h>
 #include <X11/Xlib.h>
 
 #include "base/at_exit.h"
@@ skipping 34 matching lines @@
 #include "media/tools/player_x11/x11_video_renderer.h"
 typedef X11VideoRenderer Renderer;
 #else
 #error No video renderer defined.
 #endif
 
 Display* g_display = NULL;
 Window g_window = 0;
 bool g_running = false;
 
-void Quit(MessageLoop* message_loop) {
-  message_loop->PostTask(FROM_HERE, new MessageLoop::QuitTask());
-}
+class MessageLoopQuitter {
+ public:
+  MessageLoopQuitter(MessageLoop* loop) : loop_(loop) {}

[acolwell GONE FROM CHROMIUM, 2011/03/15 23:43:55]

explicit

[Ami GONE FROM CHROMIUM, 2011/03/16 00:01:02]

Done.

+  void Quit(media::PipelineStatus status) {
+    loop_->PostTask(FROM_HERE, new MessageLoop::QuitTask());
+    delete this;
+  }
+ private:
+  MessageLoop* loop_;

[acolwell GONE FROM CHROMIUM, 2011/03/15 23:43:55]

DISALLOW_COPY_AND_ASSIGN

[Ami GONE FROM CHROMIUM, 2011/03/16 00:01:02]

Done.

+};
 
 // Initialize X11. Returns true if successful. This method creates the X11
 // window. Further initialization is done in X11VideoRenderer.
 bool InitX11() {
   g_display = XOpenDisplay(NULL);
   if (!g_display) {
     std::cout << "Error - cannot open display" << std::endl;
     return false;
   }
 
@@ skipping 51 matching lines @@
   }
   collection->AddVideoRenderer(new Renderer(g_display,
                                             g_window,
                                             paint_message_loop));
 
   if (enable_audio)
     collection->AddAudioRenderer(new media::AudioRendererImpl());
   else
     collection->AddAudioRenderer(new media::NullAudioRenderer());
 
-  // Create and start the pipeline.
+  // Create the pipeline and start it.
   *pipeline = new media::PipelineImpl(message_loop);
-  (*pipeline)->Start(collection.release(), filename, NULL);
+  media::PipelineStatusNotification note;
+  (*pipeline)->Start(collection.release(), filename, note.Callback());
 
   // Wait until the pipeline is fully initialized.
-  while (true) {
-    base::PlatformThread::Sleep(100);
-    if ((*pipeline)->IsInitialized())
-      break;
-    if ((*pipeline)->GetError() != media::PIPELINE_OK) {
-      std::cout << "InitPipeline: " << (*pipeline)->GetError() << std::endl;
-      (*pipeline)->Stop(NULL);
-      return false;
-    }
+  note.Wait();
+  if (note.status() != media::PIPELINE_OK) {
+    std::cout << "InitPipeline: " << note.status() << std::endl;
+    (*pipeline)->Stop(NULL);
+    return false;
   }
 
-  // And starts the playback.
+  // And start the playback.
   (*pipeline)->SetPlaybackRate(1.0f);
   return true;
 }
 
 void TerminateHandler(int signal) {
   g_running = false;
 }
 
 void PeriodicalUpdate(
     media::PipelineImpl* pipeline,
     MessageLoop* message_loop,
     bool audio_only) {
   if (!g_running) {
-    // interrupt signal is received during lat time period.
+    // interrupt signal was received during last time period.
     // Quit message_loop only when pipeline is fully stopped.
-    pipeline->Stop(media::TaskToCallbackAdapter::NewCallback(
-        NewRunnableFunction(Quit, message_loop)));
+    MessageLoopQuitter* quitter = new MessageLoopQuitter(message_loop);
+    pipeline->Stop(NewCallback(quitter, &MessageLoopQuitter::Quit));
     return;
   }
 
   // Consume all the X events
   while (XPending(g_display)) {
     XEvent e;
     XNextEvent(g_display, &e);
     switch (e.type) {
       case Expose:
         if (!audio_only) {
@@ skipping 19 matching lines @@
           base::TimeDelta time = pipeline->GetMediaDuration();
           pipeline->Seek(time*e.xbutton.x/width, NULL);
         }
         break;
       case KeyPress:
         {
           KeySym key = XKeycodeToKeysym(g_display, e.xkey.keycode, 0);
           if (key == XK_Escape) {
             g_running = false;
             // Quit message_loop only when pipeline is fully stopped.
-            pipeline->Stop(media::TaskToCallbackAdapter::NewCallback(
-                NewRunnableFunction(Quit, message_loop)));
+            MessageLoopQuitter* quitter = new MessageLoopQuitter(message_loop);
+            pipeline->Stop(NewCallback(quitter, &MessageLoopQuitter::Quit));
             return;
           } else if (key == XK_space) {
             if (pipeline->GetPlaybackRate() < 0.01f) // paused
               pipeline->SetPlaybackRate(1.0f);
             else
               pipeline->SetPlaybackRate(0.0f);
           }
         }
         break;
       default:
@@ skipping 63 matching lines @@
   }
 
   // Cleanup tasks.
   message_loop_factory.reset();
 
   thread->Stop();
   XDestroyWindow(g_display, g_window);
   XCloseDisplay(g_display);
   return 0;
 }