[vlc-commits] Add x-flac mimetype

[Jean-Baptiste Kempf]

npapi-vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sun Jun 12 16:16:03 2011 +0200| [6c2c7b8db2dc86c70a0805e8d02c42919d9e044c] | committer: Jean-Baptiste Kempf

Add x-flac mimetype

Close #3908

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

 src/npvlc_rc.rc.in |    6 +++---
 src/vlc.r.in       |    6 ++++--
 src/vlcshell.h     |    2 ++
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/npvlc_rc.rc.in b/src/npvlc_rc.rc.in
index 0bf5134..12d66e7 100644
--- a/src/npvlc_rc.rc.in
+++ b/src/npvlc_rc.rc.in
@@ -32,9 +32,9 @@ BEGIN
             VALUE "FileDescription", "VLC media player Web Plugin @VERSION@\0"
             VALUE "LegalCopyright", "Copyright \251 @COPYRIGHT_YEARS@ VideoLAN and VLC Authors\0"
             VALUE "LegalTrademarks", "VLC media player, VideoLAN and x264 are registered trademarks from VideoLAN\0"
-            VALUE "MIMEType", "audio/mpeg|audio/x-mpeg|video/mpeg|video/x-mpeg|video/mpeg-system|video/x-mpeg-system|audio/mp4|audio/x-m4a|video/mp4|application/mpeg4-iod|application/mpeg4-muxcodetable|video/x-m4v|video/x-msvideo|application/ogg|video/ogg|application/x-ogg|application/x-vlc-plugin|video/x-ms-asf-plugin|video/x-ms-asf|application/x-mplayer2|video/x-ms-wmv|video/x-ms-wvx|audio/x-ms-wma|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|audio/x-mpegurl|video/webm|audio/webm|application/vnd.rn-realmedia|audio/x-realaudio|audio/amr\0"
-            VALUE "FileExtents", "mp2,mp3,mpga,mpega|mp2,mp3,mpga,mpega|mpg,mpeg,mpe|mpg,mpeg,mpe|mpg,mpeg,mpe,vob|mpg,mpeg,mpe,vob|aac,mp4,mpg4|m4a|mp4,mpg4|mp4,mpg4|mp4,mpg4|m4v|avi|ogg|ogv|ogg||asf,asx|asf,asx||wmv|wvx|wma||wav|wav|3gp,3gpp|3gp,3gpp|3g2,3gpp2|3g2,3gpp2|divx|flv|flv|mkv|mka|xspf|m3u|webm|webm|rm|ra|amr\0"
-            VALUE "FileOpenName", "MPEG audio|MPEG audio|MPEG video|MPEG video|MPEG video|MPEG video|MPEG-4 audio|MPEG-4 audio|MPEG-4 video|MPEG-4 video|MPEG-4 video|MPEG-4 video|AVI video|Ogg stream|Ogg video|Ogg stream|VLC plug-in|Windows Media Video|Windows Media Video|Windows Media|Windows Media|Windows Media Video|Windows Media Audio|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|MPEG audio|WebM video|WebM audio|Real Media File|Real Media Audio|AMR audio\0"
+            VALUE "MIMEType", "audio/mpeg|audio/x-mpeg|video/mpeg|video/x-mpeg|video/mpeg-system|video/x-mpeg-system|audio/mp4|audio/x-m4a|video/mp4|application/mpeg4-iod|application/mpeg4-muxcodetable|video/x-m4v|video/x-msvideo|application/ogg|video/ogg|application/x-ogg|application/x-vlc-plugin|video/x-ms-asf-plugin|video/x-ms-asf|application/x-mplayer2|video/x-ms-wmv|video/x-ms-wvx|audio/x-ms-wma|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|audio/x-mpegurl|video/webm|audio/webm|application/vnd.rn-realmedia|audio/x-realaudio|audio/amr|audio/x-flac\0"
+            VALUE "FileExtents", "mp2,mp3,mpga,mpega|mp2,mp3,mpga,mpega|mpg,mpeg,mpe|mpg,mpeg,mpe|mpg,mpeg,mpe,vob|mpg,mpeg,mpe,vob|aac,mp4,mpg4|m4a|mp4,mpg4|mp4,mpg4|mp4,mpg4|m4v|avi|ogg|ogv|ogg||asf,asx|asf,asx||wmv|wvx|wma||wav|wav|3gp,3gpp|3gp,3gpp|3g2,3gpp2|3g2,3gpp2|divx|flv|flv|mkv|mka|xspf|m3u|webm|webm|rm|ra|amr|flac\0"
+            VALUE "FileOpenName", "MPEG audio|MPEG audio|MPEG video|MPEG video|MPEG video|MPEG video|MPEG-4 audio|MPEG-4 audio|MPEG-4 video|MPEG-4 video|MPEG-4 video|MPEG-4 video|AVI video|Ogg stream|Ogg video|Ogg stream|VLC plug-in|Windows Media Video|Windows Media Video|Windows Media|Windows Media|Windows Media Video|Windows Media Audio|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|MPEG audio|WebM video|WebM audio|Real Media File|Real Media Audio|AMR audio|FLAC audio\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/src/vlc.r.in b/src/vlc.r.in
index bca5d33..7767373 100644
--- a/src/vlc.r.in
+++ b/src/vlc.r.in
@@ -86,7 +86,8 @@ resource 'STR#' (127)
         "Readl Audio",
         /* AMR */
         "AMR audio",
- 
+        /* FLAC */
+        "FLAC audio",
     };
 };
 
@@ -157,7 +158,8 @@ resource 'STR#' (128,"MIME Type")
         "audio/x-realaudio", "ra",
         /* AMR */
         "audio/amr", "amr",
-
+        /* FLAC */
+        "audio/x-flac", "flac",
     };
 };
 
diff --git a/src/vlcshell.h b/src/vlcshell.h
index 4f0c2fd..4e2d1ed 100644
--- a/src/vlcshell.h
+++ b/src/vlcshell.h
@@ -143,6 +143,8 @@ static char mimetype[] =
     "audio/x-realaudio:ra:Real Media Audio;"
     /* AMR */
     "audio/amr:amr:AMR audio;"
+    /* FLAC */
+    "audio/x-flac:flac:FLAC audio;"
     ;