[MPlayer-cvslog] r37396 - in trunk: etc/mplayer.desktop gui/dialog/fileselect.c gui/win32/dialogs.c gui/win32/interface.c
ib
subversion at mplayerhq.hu
Fri May 8 19:24:36 CEST 2015
Author: ib
Date: Fri May 8 19:24:36 2015
New Revision: 37396
Log:
Add MIME type video/vnd.mpegurl and support for video URL playlists.
The file extension corresponding to this IANA registered MIME type is
.mxu or .m4u.
Modified:
trunk/etc/mplayer.desktop
trunk/gui/dialog/fileselect.c
trunk/gui/win32/dialogs.c
trunk/gui/win32/interface.c
Modified: trunk/etc/mplayer.desktop
==============================================================================
--- trunk/etc/mplayer.desktop Fri May 8 18:44:36 2015 (r37395)
+++ trunk/etc/mplayer.desktop Fri May 8 19:24:36 2015 (r37396)
@@ -29,4 +29,4 @@ TryExec=gmplayer
Exec=gmplayer %F
Terminal=false
Categories=GTK;AudioVideo;Audio;Video;Player;TV;
-MimeType=application/mxf;application/x-netshow-channel;application/ogg;application/ram;application/vnd.adobe.flash.movie;application/vnd.rn-realmedia;application/x-shockwave-flash;application/smil;audio/aac;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;x-content/audio-cdda;x-content/audio-dvd;x-content/video-dvd;x-content/video-svcd;x-content/video-vcd;
+MimeType=application/mxf;application/x-netshow-channel;application/ogg;application/ram;application/vnd.adobe.flash.movie;application/vnd.rn-realmedia;application/x-shockwave-flash;application/smil;audio/aac;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/vnd.mpegurl;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;x-content/audio-cdda;x-content/audio-dvd;x-content/video-dvd;x-content/video-svcd;x-content/video-vcd;
Modified: trunk/gui/dialog/fileselect.c
==============================================================================
--- trunk/gui/dialog/fileselect.c Fri May 8 18:44:36 2015 (r37395)
+++ trunk/gui/dialog/fileselect.c Fri May 8 19:24:36 2015 (r37396)
@@ -78,7 +78,7 @@ char *fsVideoAudioFilterNames[][2] = {
{ MSGTR_GUI_FilterImageVCD, "*.bin" },
{ MSGTR_GUI_FilterFileWav, "*.wav" },
{ MSGTR_GUI_FilterMediumWindows, "*.asf,*.wma,*.wmv" },
- { MSGTR_GUI_FilterFilePlaylist, "*.asx,*.m3u,*.m3u8,*.nsc,*.pls,*.ram,*.smi,*.smil,*.sml,*.vlc,*.wax,*.wmx,*.wvx" },
+ { MSGTR_GUI_FilterFilePlaylist, "*.asx,*.m3u,*.m3u8,*.m4u,*.mxu,*.nsc,*.pls,*.ram,*.smi,*.smil,*.sml,*.vlc,*.wax,*.wmx,*.wvx" },
{ MSGTR_GUI_FilterAudioAll, "*.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,*.tak,*.voc,*.vqf,*.w64,*.wav,*.wma,*.wv,*.wvp" },
{ MSGTR_GUI_FilterVideoAll, "*.264,*.3g2,*.3ga,*.3gp,*.3gp2,*.3gpp,*.3gpp2,*.asf,*.avi,*.bdm,*.bdmv,*.bin,*.clpi,*.cpi,*.cpk,*.divx,*.dv,*.f4v,*.flc,*.fli,*.flv,*.m1v,*.m2t,*.m2ts,*.m2v,*.m4v,*.mjpg,*.mkv,*.moov,*.mov,*.mp2,*.mp4,*.mpe,*.mpeg,*.mpg,*.mpl,*.mpls,*.mts,*.mxf,*.nsv,*.nuv,*.ogg,*.ogm,*.ogv,*.ogx,*.pva,*.qt,*.qtvr,*.rec,*.rm,*.rmvb,*.roq,*.rv,*.spl,*.str,*.swf,*.trp,*.ts,*.ty,*.vdr,*.viv,*.vivo,*.vob,*.webm,*.wmv,*.y4m" },
{ MSGTR_GUI_FilterFileAll, "*" },
Modified: trunk/gui/win32/dialogs.c
==============================================================================
--- trunk/gui/win32/dialogs.c Fri May 8 18:44:36 2015 (r37395)
+++ trunk/gui/win32/dialogs.c Fri May 8 19:24:36 2015 (r37396)
@@ -193,7 +193,7 @@ static void display_loadplaylistwindow(g
playlistopen.hwndOwner = gui->mainwindow;
playlistopen.hInstance = GetModuleHandle(NULL);
playlistopen.lpstrFilter = "All Files (*.*)\0*.*\0"
- "Playlist Files (*.m3u;*.pls;*.txt)\0*.m3u;*.pls;*.txt\0";
+ "Playlist Files (*.m3u;*.m4u;*.mxu;*.pls;*.txt)\0*.m3u;*.m4u;*.mxu;*.pls;*.txt\0";
playlistopen.nFilterIndex = 0;
playlistopen.lpstrTitle = acp(MSGTR_GUI_WIN32_SelectPlaylist);
playlistopen.Flags = OFN_FILEMUSTEXIST | OFN_LONGNAMES | OFN_EXPLORER | OFN_READONLY | OFN_HIDEREADONLY;
Modified: trunk/gui/win32/interface.c
==============================================================================
--- trunk/gui/win32/interface.c Fri May 8 18:44:36 2015 (r37395)
+++ trunk/gui/win32/interface.c Fri May 8 19:24:36 2015 (r37396)
@@ -181,7 +181,7 @@ int parse_filename(char *file, play_tree
if(clear)
mygui->playlist->clear_playlist(mygui->playlist);
- if(strstr(file, ".m3u") || strstr(file, ".pls"))
+ if(strstr(file, ".m3u") || strstr(file, ".m4u") || strstr(file, ".mxu") || strstr(file, ".pls"))
{
playtree = parse_playlist_file(file);
guiPlaylist(GUI_PLAYLIST_ADD, playtree, mconfig, 0);
More information about the MPlayer-cvslog
mailing list