Contribs: update libdvbpsi to 0.1.7

[vlc] / projects / mozilla / vlcplugin.cpp

diff --git a/projects/mozilla/vlcplugin.cpp b/projects/mozilla/vlcplugin.cpp
index 48a287be11afde9ba73fc3f6db14b05933a1a3d9..dea87e6a8ef98256f1c131057f1afab7d7220b66 100644 (file)
--- a/projects/mozilla/vlcplugin.cpp
+++ b/projects/mozilla/vlcplugin.cpp
@@ -28,14 +28,11 @@
  *****************************************************************************/
 #include "config.h"
 
-#ifdef HAVE_MOZILLA_CONFIG_H
-#   include <mozilla-config.h>
-#endif
-
 #include "vlcplugin.h"
 #include "control/npolibvlc.h"
 
 #include <ctype.h>
+
 #if defined(XP_UNIX)
 #   include <pthread.h>
 #elif defined(XP_WIN)
@@ -47,6 +44,7 @@
 
 #include <stdio.h>
 #include <assert.h>
+#include <stdlib.h>
 
 /*****************************************************************************
  * utilitiy functions
@@ -235,7 +233,7 @@ inline EventObj::event_t EventObj::find_event(const char *s) const
 
 bool EventObj::insert(const NPString &s, NPObject *l, bool b)
 {
-    event_t e = find_event(s.utf8characters);
+    event_t e = find_event(s.UTF8Characters);
     if( e>=maxbit() )
         return false;
 
@@ -260,7 +258,7 @@ bool EventObj::insert(const NPString &s, NPObject *l, bool b)
 
 bool EventObj::remove(const NPString &s, NPObject *l, bool b)
 {
-    event_t e = find_event(s.utf8characters);
+    event_t e = find_event(s.UTF8Characters);
     if( e>=maxbit() || !get(e) )
         return false;
 
@@ -332,7 +330,7 @@ NPError VlcPlugin::init(int argc, char* const argn[], char* const argv[])
 
     /* locate VLC module path */
 #ifdef XP_MACOSX
-    ppsz_argv[ppsz_argc++] = "--plugin-path=/Library/Internet\\ Plug-Ins/VLC\\ Plugin.plugin/Contents/MacOS/modules";
+    ppsz_argv[ppsz_argc++] = "--plugin-path=/Library/Internet\\ Plug-Ins/VLC\\ Plugin.plugin/Contents/MacOS/plugins";
     ppsz_argv[ppsz_argc++] = "--vout=minimal_macosx";
 #elif defined(XP_WIN)
     HKEY h_key;
@@ -363,6 +361,7 @@ NPError VlcPlugin::init(int argc, char* const argn[], char* const argv[])
     ppsz_argv[ppsz_argc++] = "--no-media-library";
     ppsz_argv[ppsz_argc++] = "--intf=dummy";
     ppsz_argv[ppsz_argc++] = "--no-video-title-show";
+    ppsz_argv[ppsz_argc++] = "--no-xlib";
 
     const char *progid = NULL;