...and consistent semantics

[vlc] / mozilla / vlcplugin.cpp

diff --git a/mozilla/vlcplugin.cpp b/mozilla/vlcplugin.cpp
index 4af2bffb528744efb85c4dcdf6a1568a8db88cf9..afa1399b0022740f9afb6a69ac58fabed56a60bc 100644 (file)
--- a/mozilla/vlcplugin.cpp
+++ b/mozilla/vlcplugin.cpp
@@ -70,8 +70,8 @@ static bool boolValue(const char *value) {
 NPError VlcPlugin::init(int argc, char* const argn[], char* const argv[])
 {
     /* prepare VLC command line */
-    char *ppsz_argv[32] = { "vlc" };
-    int ppsz_argc = 1;
+    char *ppsz_argv[32];
+    int ppsz_argc = 0;
 
     /* locate VLC module path */
 #ifdef XP_MACOSX
@@ -90,7 +90,7 @@ NPError VlcPlugin::init(int argc, char* const argn[], char* const argv[])
          {
              if( i_type == REG_SZ )
              {
-                 strcat( p_data, "\\plugins000" );
+                 strcat( p_data, "\\plugins" );
                  ppsz_argv[ppsz_argc++] = "--plugin-path";
                  ppsz_argv[ppsz_argc++] = p_data;
              }
@@ -99,10 +99,6 @@ NPError VlcPlugin::init(int argc, char* const argn[], char* const argv[])
     }
     ppsz_argv[ppsz_argc++] = "--no-one-instance";
 
-#if 1
-    ppsz_argv[0] = "C:\\Cygwin\\home\\damienf\\vlc-trunk\\vlc";
-#endif
-
 #endif /* XP_MACOSX */
 
     /* common settings */
@@ -273,7 +269,7 @@ VlcPlugin::~VlcPlugin()
     if( libvlc_log )
         libvlc_log_close(libvlc_log, NULL);
     if( libvlc_instance )
-        libvlc_destroy(libvlc_instance, NULL );
+        libvlc_release(libvlc_instance, NULL );
 }
 
 /*****************************************************************************