* open file widget: do nothing if the user clicked on cancel

[vlc] / mozilla / vlcplugin.h

diff --git a/mozilla/vlcplugin.h b/mozilla/vlcplugin.h
index 4e8416da9f5eb771dabb0403cb5d317dff61f46c..4ff0af525471274c89dac19f8debfdbe15fed04c 100644 (file)
--- a/mozilla/vlcplugin.h
+++ b/mozilla/vlcplugin.h
@@ -38,7 +38,6 @@
 #undef XP_UNIX
 #endif
 
-#if 0
 #ifdef XP_WIN
     /* Windows stuff */
 #endif
@@ -54,7 +53,6 @@
 #   include <X11/Intrinsic.h>
 #   include <X11/StringDefs.h>
 #endif
-#endif
 
 class VlcPlugin
 {
@@ -74,8 +72,12 @@ public:
                             { npwindow = *window; };
 
     NPClass*            getScriptClass()
-                            { return scriptClass; };
+                            { return p_scriptClass; };
 
+    void                setLog(libvlc_log_t *log)
+                            { libvlc_log = log; };
+    libvlc_log_t*       getLog()
+                            { return libvlc_log; };
 #if XP_WIN
     WNDPROC             getWindowProc()
                             { return pf_wndproc; };
@@ -96,8 +98,9 @@ public:
 
 private:
     /* VLC reference */
-    libvlc_instance_t *libvlc_instance;
-    NPClass           *scriptClass;
+    libvlc_instance_t   *libvlc_instance;
+    libvlc_log_t        *libvlc_log;
+    NPClass             *p_scriptClass;
 
     /* browser reference */
     NPP     p_browser;
@@ -116,12 +119,10 @@ private:
 /*******************************************************************************
  * Plugin properties.
  ******************************************************************************/
-#define PLUGIN_NAME         "VLC multimedia plugin"
+#define PLUGIN_NAME         "VLC Multimedia Plugin"
 #define PLUGIN_DESCRIPTION \
-    "VLC multimedia plugin <br>" \
-    " <br>" \
-    "version %s <br>" \
-    "VideoLAN WWW: <a href=\"http://www.videolan.org/\">http://www.videolan.org/</a>"
+    "Version %s, copyright 1996-2007 The VideoLAN Team" \
+    "<br><a href=\"http://www.videolan.org/\">http://www.videolan.org/</a>"
 
 #define PLUGIN_MIMETYPES \
     /* MPEG-1 and MPEG-2 */ \
@@ -140,20 +141,26 @@ private:
     "video/x-msvideo:avi:AVI video;" \
     /* QuickTime */ \
     "video/quicktime:mov,qt:QuickTime video;" \
-    /* Ogg */ \
+    /* OGG */ \
     "application/x-ogg:ogg:Ogg stream;" \
     "application/ogg:ogg:Ogg stream;" \
-    /* explicit plugin call */ \
-    "application/x-vlc-plugin::VLC plugin;" \
-    /* windows media */ \
+    /* VLC */ \
+    "application/x-vlc-plugin:vlc:VLC plugin;" \
+    /* Windows Media */ \
     "video/x-ms-asf-plugin:asf,asx:Windows Media Video;" \
     "video/x-ms-asf:asf,asx:Windows Media Video;" \
     "application/x-mplayer2::Windows Media;" \
     "video/x-ms-wmv:wmv:Windows Media;" \
-    /* Google VLC mime */ \
-    "application/x-google-vlc-plugin::Google VLC plugin" \
-    /* Misc */ \
-    "audio/wav::WAV audio" \
-    "audio/x-wav::WAV audio" \
+    /* Google VLC */ \
+    "application/x-google-vlc-plugin::Google VLC plugin;" \
+    /* WAV audio */ \
+    "audio/wav:wav:WAV audio;" \
+    "audio/x-wav:wav:WAV audio;" \
+    /* 3GPP */ \
+    "audio/3gpp:3gp,3gpp:3GPP audio;" \
+    "video/3gpp:3gp,3gpp:3GPP video;" \
+    /* 3GPP2 */ \
+    "audio/3gpp2:3g2,3gpp2:3GPP2 audio;" \
+    "video/3gpp2:3g2,3gpp2:3GPP2 video;" \
 
 #endif