Commit 7bd20857 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Don't use macros when you don't need it.

parent a9791d21
......@@ -359,67 +359,7 @@ private:
******************************************************************************/
#define PLUGIN_NAME "VLC Web Plugin"
#define PLUGIN_DESCRIPTION \
"Version %s, copyright 1996-2010 VideoLAN and Authors" \
"<br><a href=\"http://www.videolan.org/\">http://www.videolan.org/</a>"
#define PLUGIN_MIMETYPES \
/* 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;" \
/* M3U */ \
"audio/x-mpegurl:m3u:MPEG audio;" \
/* MPEG-4 */ \
"video/mp4:mp4,mpg4:MPEG-4 video;" \
"audio/mp4:mp4,mpg4:MPEG-4 audio;" \
"audio/x-m4a:m4a:MPEG-4 audio;" \
"application/mpeg4-iod:mp4,mpg4:MPEG-4 video;" \
"application/mpeg4-muxcodetable:mp4,mpg4:MPEG-4 video;" \
/* AVI */ \
"video/x-msvideo:avi:AVI video;" \
/* QuickTime */ \
"video/quicktime:mov,qt:QuickTime video;" \
/* OGG */ \
"application/x-ogg:ogg:Ogg stream;" \
"application/ogg:ogg:Ogg stream;" \
/* VLC */ \
"application/x-vlc-plugin:vlc: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 */ \
"video/x-matroska:mkv:Matroska video;" \
"audio/x-matroska:mka:Matroska audio;" \
/* 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;"
"Version %s, copyright 1996-2011 VideoLAN and Authors" \
"<br /><a href=\"http://www.videolan.org/vlc/\">http://www.videolan.org/vlc/</a>"
#endif
......@@ -68,7 +68,6 @@ static LRESULT CALLBACK Manage( HWND p_hwnd, UINT i_msg, WPARAM wpar, LPARAM lpa
*****************************************************************************/
char * NPP_GetMIMEDescription( void )
{
static char mimetype[] = PLUGIN_MIMETYPES;
return mimetype;
}
......
......@@ -79,4 +79,65 @@ int16_t NPP_HandleEvent( NPP instance, void * event );
#endif
#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;"
/* M3U */
"audio/x-mpegurl:m3u:MPEG audio;"
/* MPEG-4 */
"video/mp4:mp4,mpg4:MPEG-4 video;"
"audio/mp4:mp4,mpg4:MPEG-4 audio;"
"audio/x-m4a:m4a:MPEG-4 audio;"
"application/mpeg4-iod:mp4,mpg4:MPEG-4 video;"
"application/mpeg4-muxcodetable:mp4,mpg4:MPEG-4 video;"
/* AVI */
"video/x-msvideo:avi:AVI video;"
/* QuickTime */
"video/quicktime:mov,qt:QuickTime video;"
/* OGG */
"application/x-ogg:ogg:Ogg stream;"
"application/ogg:ogg:Ogg stream;"
/* VLC */
"application/x-vlc-plugin:vlc: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 */
"video/x-matroska:mkv:Matroska video;"
"audio/x-matroska:mka:Matroska audio;"
/* 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
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment