X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=mozilla%2Fvlcplugin.h;h=eb6c5dfcffe664e07d7f58915d5ed2460fccd865;hb=4e84ec7af9f5d77a855bb59aad9defa367a1ffcf;hp=c5c35ed380c6bd779357aa4d10cc4cac04f86dcd;hpb=141414b0c4784637a704aafebc04f253c0354671;p=vlc

diff --git a/mozilla/vlcplugin.h b/mozilla/vlcplugin.h
index c5c35ed380..eb6c5dfcff 100644
--- a/mozilla/vlcplugin.h
+++ b/mozilla/vlcplugin.h
@@ -1,8 +1,8 @@
 /*****************************************************************************
- * vlcplugin.h: a VideoLAN plugin for Mozilla
+ * vlcplugin.h: a VLC plugin for Mozilla
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: vlcplugin.h,v 1.8 2002/11/04 15:04:44 sam Exp $
+ * $Id: vlcplugin.h,v 1.13 2003/10/23 17:04:40 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -24,6 +24,7 @@
 /*******************************************************************************
  * Instance state information about the plugin.
  ******************************************************************************/
+
 class VlcPlugin
 {
 public:
@@ -53,6 +54,12 @@ public:
     Display *p_display;
 #endif
 
+#ifdef XP_MACOSX
+    /* MACOS data members */
+    NPWindow *window;
+#endif
+
+
     /* vlc data members */
     int      i_vlc;
     int      b_stream;
@@ -67,9 +74,9 @@ private:
 /*******************************************************************************
  * Plugin properties.
  ******************************************************************************/
-#define PLUGIN_NAME         "VideoLAN Client Plugin"
+#define PLUGIN_NAME         "VLC multimedia plugin"
 #define PLUGIN_DESCRIPTION \
-    "VideoLAN Client Multimedia Player Plugin <br>" \
+    "VLC multimedia plugin <br>" \
     " <br>" \
     "version %s <br>" \
     "VideoLAN WWW: <a href=\"http://www.videolan.org/\">http://www.videolan.org/</a>"
@@ -94,5 +101,10 @@ private:
     /* Ogg */ \
     "application/x-ogg:ogg:Ogg stream;" \
     /* explicit plugin call */ \
-    "application/x-vlc-plugin::VLC plugin"
+    "application/x-vlc-plugin::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" \