Contribs: update libdvbpsi to 0.1.7

[vlc] / projects / mozilla / vlcplugin.h

diff --git a/projects/mozilla/vlcplugin.h b/projects/mozilla/vlcplugin.h
index a14007fcd6e54339bc8a904cae3c3b70204f7127..5e6332d65f8e460560c29ee422b0e0ac7c63bc00 100644 (file)
--- a/projects/mozilla/vlcplugin.h
+++ b/projects/mozilla/vlcplugin.h
@@ -30,10 +30,16 @@
 #define __VLCPLUGIN_H__
 
 #include <vlc/vlc.h>
-#include <npapi.h>
-#include <vector>
 
-#include "control/nporuntime.h"
+// Setup XP_MACOSX, XP_UNIX, XP_WIN
+#if defined(_WIN32)
+#define XP_WIN 1
+#elif defined(__APPLE__)
+#define XP_MACOSX 1
+#else
+#define XP_UNIX 1
+#define MOZ_X11 1
+#endif
 
 #if !defined(XP_MACOSX) && !defined(XP_UNIX) && !defined(XP_WIN)
 #define XP_UNIX 1
@@ -43,6 +49,7 @@
 
 #ifdef XP_WIN
     /* Windows stuff */
+#   include <windows.h>
 #   include <winbase.h>
 #endif
 
@@ -71,6 +78,12 @@
 #   define __MIN(a, b)   ( ((a) < (b)) ? (a) : (b) )
 #endif
 
+#include <npapi.h>
+#include <vector>
+
+#include "control/nporuntime.h"
+
+
 typedef struct {
 #if defined(XP_UNIX)
     pthread_mutex_t mutex;
@@ -173,7 +186,11 @@ private:
 class VlcPlugin
 {
 public:
+#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
              VlcPlugin( NPP, uint16 );
+#else
+             VlcPlugin( NPP, uint16_t );
+#endif
     virtual ~VlcPlugin();
 
     NPError             init(int argc, char* const argn[], char* const argv[]);
@@ -226,7 +243,11 @@ public:
     vlc_toolbar_clicked_t getToolbarButtonClicked( int i_xpos, int i_ypos );
 #endif
 
+#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
     uint16    i_npmode; /* either NP_EMBED or NP_FULL */
+#else
+    uint16_t  i_npmode; /* either NP_EMBED or NP_FULL */
+#endif
 
     /* plugin properties */
     int      b_stream;
@@ -237,6 +258,8 @@ public:
 
     void playlist_play()
     {
+        if( playlist_isplaying() )
+            playlist_stop();
         if( libvlc_media_player||playlist_select(0) )
             libvlc_media_player_play(libvlc_media_player);
     }
@@ -335,9 +358,9 @@ private:
 /*******************************************************************************
  * Plugin properties.
  ******************************************************************************/
-#define PLUGIN_NAME         "VLC Multimedia Plug-in"
+#define PLUGIN_NAME         "VLC Web Plugin"
 #define PLUGIN_DESCRIPTION \
-    "Version %s, copyright 1996-2007 The VideoLAN Team" \
+    "Version %s, copyright 1996-2010 VideoLAN and Authors" \
     "<br><a href=\"http://www.videolan.org/\">http://www.videolan.org/</a>"
 
 #define PLUGIN_MIMETYPES \
@@ -392,6 +415,12 @@ private:
     "video/x-matroska:mkv:Matroska video;" \
     "audio/x-matroska:mka:Matroska audio;" \
     /* XSPF */ \
-    "application/xspf+xml:xspf:Playlist xspf;"
+    "application/xspf+xml:xspf:Playlist xspf;" \
+    /* Webm */ \
+    "video/webm:webm:WebM video;" \
+    "audio/webm:webm:WebM audio;" \
+    /* Real Media */ \
+    "application/vnd.rn-realmedia:rm:Real Media File;" \
+    "audio/x-realaudio:ra:Real Media Audio;"
 
 #endif