[vlc-commits] VLCPlugin_base: simplification and cleaning

[Jean-Baptiste Kempf]

npapi-vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Thu Apr 24 14:07:40 2014 +0200| [5683a41d31c4ee725dcb3a0bd3c7a438a05d0712] | committer: Jean-Baptiste Kempf

VLCPlugin_base: simplification and cleaning

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

 npapi/vlcplugin_base.h |   16 +++++++---------
 npapi/vlcshell.cpp     |    2 --
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/npapi/vlcplugin_base.h b/npapi/vlcplugin_base.h
index c066b93..e44b76f 100644
--- a/npapi/vlcplugin_base.h
+++ b/npapi/vlcplugin_base.h
@@ -73,25 +73,23 @@ public:
         { return *static_cast<const vlc_player_options*>(this); }
 
     NPError             init(int argc, char* const argn[], char* const argv[]);
-    libvlc_instance_t*  getVLC()
-                            { return libvlc_instance; };
+
     libvlc_media_player_t* getMD()
     {
-        if( !get_player().is_open() )
+        if( !is_open() )
         {
              libvlc_printerr("no mediaplayer");
         }
         return get_player().get_mp();
     }
-    NPP                 getBrowser()
-                            { return p_browser; };
+
+    NPP                 getBrowser() { return p_browser; };
     char*               getAbsoluteURL(const char *url);
-    NPWindow&           getWindow()
-                            { return npwindow; };
+
+    NPWindow&           getWindow()  { return npwindow; };
     virtual void        setWindow(const NPWindow &window);
 
-    NPClass*            getScriptClass()
-                            { return p_scriptClass; };
+    NPClass*            getScriptClass() { return p_scriptClass; };
 
     NPuint16_t  i_npmode; /* either NP_EMBED or NP_FULL */
 
diff --git a/npapi/vlcshell.cpp b/npapi/vlcshell.cpp
index 47294dc..2dcf058 100644
--- a/npapi/vlcshell.cpp
+++ b/npapi/vlcshell.cpp
@@ -337,8 +337,6 @@ NPError NPP_SetWindow( NPP instance, NPWindow* window )
         return NPERR_NO_ERROR;
     }
 
-    p_plugin->getVLC();
-
     /*
      * PLUGIN DEVELOPERS:
      *  Before setting window to point to the