[vlc-commits] Move mimetype declaration to the .cpp
Jean-Baptiste Kempf
git at videolan.org
Fri Dec 14 13:19:08 CET 2012
npapi-vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Fri Dec 14 13:18:47 2012 +0100| [ecddb18da82eaac1907d1060af470690821eaa58] | committer: Jean-Baptiste Kempf
Move mimetype declaration to the .cpp
> http://git.videolan.org/gitweb.cgi/npapi-vlc.git/?a=commit;h=ecddb18da82eaac1907d1060af470690821eaa58
---
npapi/vlcshell.cpp | 68 +++++++++++++++++++++++++++++++++++++++++++++++++++
npapi/vlcshell.h | 69 ----------------------------------------------------
2 files changed, 68 insertions(+), 69 deletions(-)
diff --git a/npapi/vlcshell.cpp b/npapi/vlcshell.cpp
index d4cdaae..85755eb 100644
--- a/npapi/vlcshell.cpp
+++ b/npapi/vlcshell.cpp
@@ -38,6 +38,74 @@
#include "vlcplugin.h"
#include "vlcshell.h"
+static char mimetype[] =
+ /* MPEG-1 and MPEG-2 */
+ "audio/mpeg:mp2,mp3,mpga,mpega:MPEG audio;"
+ "audio/x-mpeg:mp2,mp3,mpga,mpega:MPEG audio;"
+ "video/mpeg:mpg,mpeg,mpe:MPEG video;"
+ "video/x-mpeg:mpg,mpeg,mpe:MPEG video;"
+ "video/mpeg-system:mpg,mpeg,mpe,vob:MPEG video;"
+ "video/x-mpeg-system:mpg,mpeg,mpe,vob:MPEG video;"
+ /* MPEG-4 */
+ "audio/mp4:aac,mp4,mpg4:MPEG-4 audio;"
+ "audio/x-m4a:m4a:MPEG-4 audio;"
+ /* MPEG-4 ASP */
+ "video/mp4:mp4,mpg4:MPEG-4 video;"
+ "application/mpeg4-iod:mp4,mpg4:MPEG-4 video;"
+ "application/mpeg4-muxcodetable:mp4,mpg4:MPEG-4 video;"
+ "video/x-m4v:m4v:MPEG-4 video;"
+ /* AVI */
+ "video/x-msvideo:avi:AVI video;"
+ /* QuickTime */
+ /* "video/quicktime:mov,qt:QuickTime video;" */
+ /* OGG */
+ "application/ogg:ogg:Ogg stream;"
+ "video/ogg:ogv:Ogg video;"
+ "application/x-ogg:ogg:Ogg stream;"
+ /* VLC */
+ "application/x-vlc-plugin::VLC plug-in;"
+ /* 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;"
+ "video/x-ms-wvx:wvx:Windows Media Video;"
+ "audio/x-ms-wma:wma:Windows Media Audio;"
+ /* Google VLC */
+ "application/x-google-vlc-plugin::Google VLC plug-in;"
+ /* 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;"
+ /* DIVX */
+ "video/divx:divx:DivX video;"
+ /* FLV */
+ "video/flv:flv:FLV video;"
+ "video/x-flv:flv:FLV video;"
+ /* Matroska */
+ "application/x-matroska:mkv:Matroska video;"
+ "video/x-matroska:mkv:Matroska video;"
+ "audio/x-matroska:mka:Matroska audio;"
+ /* XSPF */
+ "application/xspf+xml:xspf:Playlist xspf;"
+ /* M3U */
+ "audio/x-mpegurl:m3u:MPEG audio;"
+ /* 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;"
+ /* AMR */
+ "audio/amr:amr:AMR audio;"
+ /* FLAC */
+ "audio/x-flac:flac:FLAC audio;"
+ ;
/******************************************************************************
* UNIX-only API calls
diff --git a/npapi/vlcshell.h b/npapi/vlcshell.h
index 7242ae5..0c50170 100644
--- a/npapi/vlcshell.h
+++ b/npapi/vlcshell.h
@@ -63,75 +63,6 @@ void NPP_Print( NPP instance, NPPrint* printInfo );
NPint16_t NPP_HandleEvent( NPP instance, void * event );
#endif
-static char mimetype[] =
- /* MPEG-1 and MPEG-2 */
- "audio/mpeg:mp2,mp3,mpga,mpega:MPEG audio;"
- "audio/x-mpeg:mp2,mp3,mpga,mpega:MPEG audio;"
- "video/mpeg:mpg,mpeg,mpe:MPEG video;"
- "video/x-mpeg:mpg,mpeg,mpe:MPEG video;"
- "video/mpeg-system:mpg,mpeg,mpe,vob:MPEG video;"
- "video/x-mpeg-system:mpg,mpeg,mpe,vob:MPEG video;"
- /* MPEG-4 */
- "audio/mp4:aac,mp4,mpg4:MPEG-4 audio;"
- "audio/x-m4a:m4a:MPEG-4 audio;"
- /* MPEG-4 ASP */
- "video/mp4:mp4,mpg4:MPEG-4 video;"
- "application/mpeg4-iod:mp4,mpg4:MPEG-4 video;"
- "application/mpeg4-muxcodetable:mp4,mpg4:MPEG-4 video;"
- "video/x-m4v:m4v:MPEG-4 video;"
- /* AVI */
- "video/x-msvideo:avi:AVI video;"
- /* QuickTime */
- /* "video/quicktime:mov,qt:QuickTime video;" */
- /* OGG */
- "application/ogg:ogg:Ogg stream;"
- "video/ogg:ogv:Ogg video;"
- "application/x-ogg:ogg:Ogg stream;"
- /* VLC */
- "application/x-vlc-plugin::VLC plug-in;"
- /* 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;"
- "video/x-ms-wvx:wvx:Windows Media Video;"
- "audio/x-ms-wma:wma:Windows Media Audio;"
- /* Google VLC */
- "application/x-google-vlc-plugin::Google VLC plug-in;"
- /* 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;"
- /* DIVX */
- "video/divx:divx:DivX video;"
- /* FLV */
- "video/flv:flv:FLV video;"
- "video/x-flv:flv:FLV video;"
- /* Matroska */
- "application/x-matroska:mkv:Matroska video;"
- "video/x-matroska:mkv:Matroska video;"
- "audio/x-matroska:mka:Matroska audio;"
- /* XSPF */
- "application/xspf+xml:xspf:Playlist xspf;"
- /* M3U */
- "audio/x-mpegurl:m3u:MPEG audio;"
- /* 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;"
- /* AMR */
- "audio/amr:amr:AMR audio;"
- /* FLAC */
- "audio/x-flac:flac:FLAC audio;"
- ;
-
/*******************************************************************************
* Plugin properties.
******************************************************************************/
More information about the vlc-commits
mailing list