[vlc-commits] NPAPI: reparent the video

[Jean-Baptiste Kempf]

npapi-vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Wed Jun  6 22:36:02 2012 +0200| [effa49e35651ebeb2db3a7ce6cdbde509e5a5ad4] | committer: Jean-Baptiste Kempf

NPAPI: reparent the video

> http://git.videolan.org/gitweb.cgi/npapi-vlc.git/?a=commit;h=effa49e35651ebeb2db3a7ce6cdbde509e5a5ad4
---

 npapi/vlcplugin_base.h |    3 ++-
 npapi/vlcshell.cpp     |    1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/npapi/vlcplugin_base.h b/npapi/vlcplugin_base.h
index c5daa25..4bb4f8d 100644
--- a/npapi/vlcplugin_base.h
+++ b/npapi/vlcplugin_base.h
@@ -304,6 +304,8 @@ public:
     virtual void update_controls() = 0;
     virtual void popup_menu() = 0;
 
+    virtual void set_player_window() = 0;
+
     static bool canUseEventListener();
 
     EventObj events;
@@ -316,7 +318,6 @@ protected:
     virtual void on_media_player_release() {};
 
     bool playlist_select(int);
-    virtual void set_player_window() = 0;
 
     /* VLC reference */
     libvlc_instance_t   *libvlc_instance;
diff --git a/npapi/vlcshell.cpp b/npapi/vlcshell.cpp
index 6bf2fd7..76c7013 100644
--- a/npapi/vlcshell.cpp
+++ b/npapi/vlcshell.cpp
@@ -348,6 +348,7 @@ NPError NPP_SetWindow( NPP instance, NPWindow* window )
             p_plugin->setWindow(*window);
             p_plugin->create_windows();
             p_plugin->resize_windows();
+            p_plugin->set_player_window();
 
             /* now set plugin state to that requested in parameters */
             bool show_toolbar = p_plugin->get_options().get_show_toolbar();