[vlc-devel] commit: Add xpsf in browsers... (Jean-Baptiste Kempf )

[git version control]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Tue Sep  9 23:52:56 2008 -0700| [d31ffb66570ed113e7df4477e8e99f260a5b256a] | committer: Jean-Baptiste Kempf 

Add xpsf in browsers...

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=d31ffb66570ed113e7df4477e8e99f260a5b256a
---

 projects/mozilla/npvlc_rc.rc.in |    6 +++---
 projects/mozilla/vlc.r          |    5 +++++
 projects/mozilla/vlcplugin.h    |    4 +++-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/projects/mozilla/npvlc_rc.rc.in b/projects/mozilla/npvlc_rc.rc.in
index 26e310d..335306a 100644
--- a/projects/mozilla/npvlc_rc.rc.in
+++ b/projects/mozilla/npvlc_rc.rc.in
@@ -31,9 +31,9 @@ BEGIN
             VALUE "InternalName", "npvlc\0"
             VALUE "CompanyName", "the VideoLAN Team\0"
             VALUE "LegalCopyright", "Copyright \251 @COPYRIGHT_YEARS@ The VideoLAN Team\0"
-            VALUE "MIMEType", "audio/mpeg|audio/x-mpeg|video/mpeg|video/x-mpeg|video/mpeg-system|video/x-mpeg-system|video/mp4|audio/mp4|application/mpeg4-iod|application/mpeg4-muxcodetable|video/x-msvideo|video/quicktime|application/x-ogg|application/ogg|application/x-vlc-plugin|video/x-ms-asf-plugin|video/x-ms-asf|application/x-mplayer2|video/x-ms-wmv|application/x-google-vlc-plugin|audio/wav|audio/x-wav|audio/3gpp|video/3gpp|audio/3gpp2|video/3gpp2|video/divx|video/flv|video/x-flv|video/x-matroska|audio/x-matroska\0"
-            VALUE "FileExtents", "mp2,mp3,mpga,mpega|mp2,mp3,mpga,mpega|mpg,mpeg,mpe|mpg,mpeg,mpe|mpg,mpeg,vob|mpg,mpeg,vob|mp4,mpg4|mp4,mpg4|mp4,mpg4|mp4,mpg4|avi|mov,qt|ogg|ogg|vlc|asf,asx|asf,asx||wmv||wav|wav|3gp,3gpp|3gp,3gpp|3g2,3gpp2|3g2,3gpp2|divx|flv|flv|mkv|mka\0"
-            VALUE "FileOpenName", "MPEG audio|MPEG audio|MPEG video|MPEG video|MPEG video|MPEG video|MPEG-4 video|MPEG-4 audio|MPEG-4 video|MPEG-4 video|AVI video|QuickTime video|Ogg stream|Ogg stream|VLC plug-in|Windows Media video|Windows Media video|Windows Media plug-in|Windows Media video|Google VLC plug-in|WAV audio|WAV audio|3GPP audio|3GPP video|3GPP2 audio|3GPP2 video|DivX video|FLV video|FLV video|Matroska video|Matroska audio\0"
+            VALUE "MIMEType", "audio/mpeg|audio/x-mpeg|video/mpeg|video/x-mpeg|video/mpeg-system|video/x-mpeg-system|video/mp4|audio/mp4|application/mpeg4-iod|application/mpeg4-muxcodetable|video/x-msvideo|video/quicktime|application/x-ogg|application/ogg|application/x-vlc-plugin|video/x-ms-asf-plugin|video/x-ms-asf|application/x-mplayer2|video/x-ms-wmv|application/x-google-vlc-plugin|audio/wav|audio/x-wav|audio/3gpp|video/3gpp|audio/3gpp2|video/3gpp2|video/divx|video/flv|video/x-flv|video/x-matroska|audio/x-matroska|application/xspf+xml\0"
+            VALUE "FileExtents", "mp2,mp3,mpga,mpega|mp2,mp3,mpga,mpega|mpg,mpeg,mpe|mpg,mpeg,mpe|mpg,mpeg,vob|mpg,mpeg,vob|mp4,mpg4|mp4,mpg4|mp4,mpg4|mp4,mpg4|avi|mov,qt|ogg|ogg|vlc|asf,asx|asf,asx||wmv||wav|wav|3gp,3gpp|3gp,3gpp|3g2,3gpp2|3g2,3gpp2|divx|flv|flv|mkv|mka|xspf\0"
+            VALUE "FileOpenName", "MPEG audio|MPEG audio|MPEG video|MPEG video|MPEG video|MPEG video|MPEG-4 video|MPEG-4 audio|MPEG-4 video|MPEG-4 video|AVI video|QuickTime video|Ogg stream|Ogg stream|VLC plug-in|Windows Media video|Windows Media video|Windows Media plug-in|Windows Media video|Google VLC plug-in|WAV audio|WAV audio|3GPP audio|3GPP video|3GPP2 audio|3GPP2 video|DivX video|FLV video|FLV video|Matroska video|Matroska audio|Playlist xspf\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/projects/mozilla/vlc.r b/projects/mozilla/vlc.r
index 69b62da..12e07ec 100644
--- a/projects/mozilla/vlc.r
+++ b/projects/mozilla/vlc.r
@@ -65,6 +65,9 @@ resource 'STR#' (127)
         /* FLV */
         "FLV video",
         "FLV video",
+        /* MkV */
+        "MKV video",
+        "MKV audio",
     };
 };
 
@@ -117,6 +120,8 @@ resource 'STR#' (128,"MIME Type")
         /* MKV */
         "video/x-matroska", "mkv",
         "audio/x-matroska", "mka",
+        /* XSPF */
+        "application/xspf+xml", "xspf",
 
     };
 };
diff --git a/projects/mozilla/vlcplugin.h b/projects/mozilla/vlcplugin.h
index 4a1e3d9..75c5eff 100644
--- a/projects/mozilla/vlcplugin.h
+++ b/projects/mozilla/vlcplugin.h
@@ -226,7 +226,9 @@ private:
     "video/x-flv:flv:FLV video;" \
     /* Matroska */ \
     "video/x-matroska:mkv:Matroska video;" \
-    "audio/x-matroska:mka:Matroska audio;"
+    "audio/x-matroska:mka:Matroska audio;" \
+    /* XSPF */ \
+    "application/xspf+xml:xspf:Playlist xspf;"