[MPlayer-cvslog] r34957 - in trunk: debian/mplayer-gui.mime debian/mplayer.mime etc/mplayer.desktop gui/ui/gtk/fileselect.c

[ib]

Author: ib
Date: Tue May 22 00:56:37 2012
New Revision: 34957

Log:
Add Windows Media Station file (application/x-netshow-channel) support.

Modified:
   trunk/debian/mplayer-gui.mime
   trunk/debian/mplayer.mime
   trunk/etc/mplayer.desktop
   trunk/gui/ui/gtk/fileselect.c

Modified: trunk/debian/mplayer-gui.mime
==============================================================================
--- trunk/debian/mplayer-gui.mime	Mon May 21 22:53:55 2012	(r34956)
+++ trunk/debian/mplayer-gui.mime	Tue May 22 00:56:37 2012	(r34957)
@@ -1,4 +1,5 @@
 application/mxf; /usr/bin/gmplayer %s; description="MXF video"
+application/x-netshow-channel; /usr/bin/gmplayer %s; description="Windows Media Station file"
 application/ogg; /usr/bin/gmplayer %s; description="Ogg multimedia file"
 application/ram; /usr/bin/gmplayer %s; description="RealMedia Metafile"
 application/vnd.rn-realmedia; /usr/bin/gmplayer %s; description="RealMedia document"

Modified: trunk/debian/mplayer.mime
==============================================================================
--- trunk/debian/mplayer.mime	Mon May 21 22:53:55 2012	(r34956)
+++ trunk/debian/mplayer.mime	Tue May 22 00:56:37 2012	(r34957)
@@ -1,4 +1,5 @@
 application/mxf; /usr/bin/mplayer %s; description="MXF video"
+application/x-netshow-channel; /usr/bin/mplayer %s; description="Windows Media Station file"
 application/ogg; /usr/bin/mplayer %s; description="Ogg multimedia file"
 application/ram; /usr/bin/mplayer %s; description="RealMedia Metafile"
 application/vnd.rn-realmedia; /usr/bin/mplayer %s; description="RealMedia document"

Modified: trunk/etc/mplayer.desktop
==============================================================================
--- trunk/etc/mplayer.desktop	Mon May 21 22:53:55 2012	(r34956)
+++ trunk/etc/mplayer.desktop	Tue May 22 00:56:37 2012	(r34957)
@@ -27,4 +27,4 @@ TryExec=gmplayer
 Exec=gmplayer %F
 Terminal=false
 Categories=GTK;AudioVideo;Audio;Video;Player;TV;
-MimeType=application/mxf;application/ogg;application/ram;application/vnd.rn-realmedia;application/x-shockwave-flash;application/smil;audio/ac3;audio/x-adpcm;audio/x-aiff;audio/AMR;audio/AMR-WB;audio/x-ape;audio/basic;audio/flac;audio/x-flac;audio/x-flac+ogg;audio/x-m4b;audio/x-matroska;audio/mp2;audio/mp4;audio/mpeg;audio/x-mpegurl;audio/x-ms-asx;audio/x-ms-wma;audio/x-musepack;audio/ogg;audio/vnd.rn-realaudio;audio/x-scpls;audio/x-voc;audio/x-vorbis+ogg;audio/x-wav;audio/x-wavpack;video/3gpp;video/3gpp2;video/dv;video/x-flic;video/x-flv;video/x-matroska;video/mp2t;video/mp4;video/mpeg;video/x-ms-asf;video/x-ms-wmv;video/x-msvideo;video/x-nsv;video/ogg;video/x-ogm+ogg;video/quicktime;video/vnd.rn-realvideo;video/x-theora+ogg;video/webm;
+MimeType=application/mxf;application/x-netshow-channel;application/ogg;application/ram;application/vnd.rn-realmedia;application/x-shockwave-flash;application/smil;audio/ac3;audio/x-adpcm;audio/x-aiff;audio/AMR;audio/AMR-WB;audio/x-ape;audio/basic;audio/flac;audio/x-flac;audio/x-flac+ogg;audio/x-m4b;audio/x-matroska;audio/mp2;audio/mp4;audio/mpeg;audio/x-mpegurl;audio/x-ms-asx;audio/x-ms-wma;audio/x-musepack;audio/ogg;audio/vnd.rn-realaudio;audio/x-scpls;audio/x-voc;audio/x-vorbis+ogg;audio/x-wav;audio/x-wavpack;video/3gpp;video/3gpp2;video/dv;video/x-flic;video/x-flv;video/x-matroska;video/mp2t;video/mp4;video/mpeg;video/x-ms-asf;video/x-ms-wmv;video/x-msvideo;video/x-nsv;video/ogg;video/x-ogm+ogg;video/quicktime;video/vnd.rn-realvideo;video/x-theora+ogg;video/webm;

Modified: trunk/gui/ui/gtk/fileselect.c
==============================================================================
--- trunk/gui/ui/gtk/fileselect.c	Mon May 21 22:53:55 2012	(r34956)
+++ trunk/gui/ui/gtk/fileselect.c	Tue May 22 00:56:37 2012	(r34957)
@@ -77,7 +77,7 @@ char * fsVideoFilterNames[][2] =
 	   { MSGTR_Filter_VideoCDImages, "*.bin" },
 	   { MSGTR_Filter_WAVFiles,      "*.wav" },
 	   { MSGTR_Filter_WindowsMedia,  "*.asf,*.wma,*.wmv" },
-	   { MSGTR_Filter_Playlists,     "*.asx,*.m3u,*.m3u8,*.pls,*.ram,*.smi,*.smil,*.sml,*.vlc,*.wax,*.wmx,*.wvx" },
+	   { MSGTR_Filter_Playlists,     "*.asx,*.m3u,*.m3u8,*.nsc,*.pls,*.ram,*.smi,*.smil,*.sml,*.vlc,*.wax,*.wmx,*.wvx" },
 	   { MSGTR_Filter_AllAudioFiles, "*.aac,*.ac3,*.aif,*.aifc,*.aiff,*.amr,*.ape,*.au,*.awb,*.cdg,*.f4a,*.f4b,*.flac,*.m4a,*.m4b,*.mka,*.mp+,*.mp2,*.mp3,*.mpc,*.mpga,*.mpp,*.nsa,*.oga,*.ogg,*.pcm,*.qcp,*.ra,*.snd,*.spx,*.voc,*.vqf,*.w64,*.wav,*.wma,*.wv,*.wvp" },
 	   { MSGTR_Filter_AllVideoFiles, "*.264,*.3g2,*.3ga,*.3gp,*.3gp2,*.3gpp,*.3gpp2,*.asf,*.avi,*.bdm,*.bdmv,*.bin,*.clpi,*.cpi,*.divx,*.dv,*.f4v,*.flc,*.fli,*.flv,*.m1v,*.m2t,*.m2ts,*.m2v,*.m4v,*.mkv,*.moov,*.mov,*.mp2,*.mp4,*.mpe,*.mpeg,*.mpg,*.mpl,*.mpls,*.mts,*.mxf,*.nsv,*.nuv,*.ogg,*.ogm,*.ogv,*.ogx,*.pva,*.qt,*.qtvr,*.rec,*.rm,*.rmvb,*.rv,*.spl,*.str,*.swf,*.trp,*.ts,*.ty,*.vdr,*.viv,*.vivo,*.vob,*.webm,*.wmv" },
 	   { MSGTR_Filter_AllFiles,      "*" },