diff options
Diffstat (limited to 'media/tools/player_x11/x11_video_renderer.h')
-rw-r--r-- | media/tools/player_x11/x11_video_renderer.h | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/media/tools/player_x11/x11_video_renderer.h b/media/tools/player_x11/x11_video_renderer.h index 5b7a954..2bd9dc4 100644 --- a/media/tools/player_x11/x11_video_renderer.h +++ b/media/tools/player_x11/x11_video_renderer.h @@ -10,17 +10,20 @@ #include "base/lock.h" #include "base/scoped_ptr.h" #include "media/base/factory.h" +#include "media/base/filters.h" #include "media/filters/video_renderer_base.h" class X11VideoRenderer : public media::VideoRendererBase { public: static media::FilterFactory* CreateFactory(Display* display, - Window window) { - return new media::FilterFactoryImpl2< - X11VideoRenderer, Display*, Window>(display, window); + Window window, + MessageLoop* message_loop) { + return new media::FilterFactoryImpl3< + X11VideoRenderer, Display*, Window, MessageLoop*>(display, window, + message_loop); } - X11VideoRenderer(Display* display, Window window); + X11VideoRenderer(Display* display, Window window, MessageLoop* message_loop); // This method is called to paint the current video frame to the assigned // window. @@ -31,10 +34,6 @@ class X11VideoRenderer : public media::VideoRendererBase { static X11VideoRenderer* instance() { return instance_; } - void set_glx_thread_message_loop(MessageLoop* message_loop) { - glx_thread_message_loop_ = message_loop; - } - MessageLoop* glx_thread_message_loop() { return glx_thread_message_loop_; } @@ -42,7 +41,7 @@ class X11VideoRenderer : public media::VideoRendererBase { protected: // VideoRendererBase implementation. virtual bool OnInitialize(media::VideoDecoder* decoder); - virtual void OnStop(); + virtual void OnStop(media::FilterCallback* callback); virtual void OnFrameAvailable(); private: |