May 2012 - MPlayer-cvslog - lists.mplayerhq.hu

r34937 - trunk/gui/ui/gtk/fileselect.c
by ib 21 May '12

21 May '12

Author: ib Date: Mon May 21 11:52:25 2012 New Revision: 34937 Log: Update subtitle file filter for file selector. Add descriptive names for the subtitle types and add JACOSub (*.jss). Modified: trunk/gui/ui/gtk/fileselect.c Modified: trunk/gui/ui/gtk/fileselect.c ============================================================================== --- trunk/gui/ui/gtk/fileselect.c Mon May 21 11:47:09 2012 (r34936) +++ trunk/gui/ui/gtk/fileselect.c Mon May 21 11:52:25 2012 (r34937) @@ -94,17 +94,18 @@ int fsLastVideoFilterSelected = -1; char * fsSubtitleFilterNames[][2] = { - { "AQT (*.aqt)", "*.aqt" }, - { "ASS (*.ass)", "*.ass" }, - { "RT (*.rt) ", "*.rt" }, - { "SMI (*.smi)", "*.smi" }, - { "SRT (*.srt)", "*.srt" }, - { "SSA (*.ssa)", "*.ssa" }, - { "SUB (*.sub)", "*.sub" }, - { "TXT (*.txt)", "*.txt" }, - { "UTF (*.utf)", "*.utf" }, - { "Subtitles", "*.aqt,*.ass,*.rt,*.smi,*.srt,*.ssa,*.sub,*.txt,*.utf" }, - { "All files", "*" }, + { "AQTitle (*.aqt)", "*.aqt" }, + { "Advanced SubStation Alpha (*.ass)", "*.ass" }, + { "JACOSub (*.jss) ", "*.jss" }, + { "RealText (*.rt) ", "*.rt" }, + { "SAMI (*.smi)", "*.smi" }, + { "SubRip (*.srt)", "*.srt" }, + { "SubStation Alpha (*.ssa)", "*.ssa" }, + { "MicroDVD (*.sub)", "*.sub" }, + { "Text (*.txt)", "*.txt" }, + { "UTF (*.utf)", "*.utf" }, + { "All subtitles", "*.aqt,*.ass,*.jss,*.rt,*.smi,*.srt,*.ssa,*.sub,*.txt,*.utf" }, + { "All files", "*" }, { NULL,NULL } }; int fsLastSubtitleFilterSelected = -1;

3 3

r34948 - trunk/sub/subreader.c
by reimar 21 May '12

21 May '12

Author: reimar Date: Mon May 21 21:17:55 2012 New Revision: 34948 Log: Make array const and more compact. Modified: trunk/sub/subreader.c Modified: trunk/sub/subreader.c ============================================================================== --- trunk/sub/subreader.c Mon May 21 20:46:25 2012 (r34947) +++ trunk/sub/subreader.c Mon May 21 21:17:55 2012 (r34948) @@ -1477,7 +1477,7 @@ sub_data* sub_read_file (const char *fil int l,k; k = -1; if ((l=strlen(filename))>4){ - char *exts[] = {".utf", ".utf8", ".utf-8" }; + static const char exts[][8] = {".utf", ".utf8", ".utf-8" }; for (k=3;--k>=0;) if (l >= strlen(exts[k]) && !strcasecmp(filename+(l - strlen(exts[k])), exts[k])){ sub_utf8 = 1;

1 0

r34947 - in trunk/gui: interface.c ui/gtk/fileselect.c ui/main.c
by ib 21 May '12

21 May '12

Author: ib Date: Mon May 21 20:46:25 2012 New Revision: 34947 Log: Add playlist support to the GUI. Modified: trunk/gui/interface.c trunk/gui/ui/gtk/fileselect.c trunk/gui/ui/main.c Modified: trunk/gui/interface.c ============================================================================== --- trunk/gui/interface.c Mon May 21 17:31:03 2012 (r34946) +++ trunk/gui/interface.c Mon May 21 20:46:25 2012 (r34947) @@ -595,6 +595,9 @@ int gui(int what, void *data) case GUI_SET_STREAM: + if (guiInfo.StreamType == STREAMTYPE_PLAYLIST) + guiInfo.mpcontext->file_format = DEMUXER_TYPE_PLAYLIST; + stream = data; guiInfo.StreamType = stream->type; Modified: trunk/gui/ui/gtk/fileselect.c ============================================================================== --- trunk/gui/ui/gtk/fileselect.c Mon May 21 17:31:03 2012 (r34946) +++ trunk/gui/ui/gtk/fileselect.c Mon May 21 20:46:25 2012 (r34947) @@ -485,7 +485,7 @@ static void fs_Up_released( GtkButton * static void fs_Ok_released( GtkButton * button, gpointer user_data ) { GList * item; - int i = 1; + int i = 1, l; struct stat fs; stat( fsSelectedFile,&fs ); @@ -503,7 +503,9 @@ static void fs_Ok_released( GtkButton * switch ( fsType ) { case fsVideoSelector: - uiSetFileName( fsSelectedDirectory,fsSelectedFile,STREAMTYPE_FILE ); + for (l = 0; fsVideoFilterNames[l][0]; l++) + if (strcmp(fsVideoFilterNames[l][0], MSGTR_Filter_Playlists) == 0) break; + uiSetFileName( fsSelectedDirectory,fsSelectedFile, fsLastVideoFilterSelected == l ? STREAMTYPE_PLAYLIST : STREAMTYPE_FILE ); guiInfo.NewPlay=GUI_FILE_NEW; sub_fps=0; fs_PersistantHistory( get_current_dir_name_utf8() ); //totem, write into history break; Modified: trunk/gui/ui/main.c ============================================================================== --- trunk/gui/ui/main.c Mon May 21 17:31:03 2012 (r34946) +++ trunk/gui/ui/main.c Mon May 21 20:46:25 2012 (r34947) @@ -218,6 +218,7 @@ play: { case STREAMTYPE_FILE: case STREAMTYPE_STREAM: + case STREAMTYPE_PLAYLIST: guiInfoMediumClear( CLEAR_ALL - CLEAR_FILE ); if ( !guiInfo.Track ) guiInfo.Track=1;

1 0

r34946 - trunk/Changelog
by ib 21 May '12

21 May '12

Author: ib Date: Mon May 21 17:31:03 2012 New Revision: 34946 Log: GUI updates for release. Modified: trunk/Changelog Modified: trunk/Changelog ============================================================================== --- trunk/Changelog Mon May 21 17:12:18 2012 (r34945) +++ trunk/Changelog Mon May 21 17:31:03 2012 (r34946) @@ -24,8 +24,11 @@ MPlayer * try reconnecting network streams e.g. after network timeouts * lots of bug fixes as always (and surely a few new bugs, too :-( ) - GUI: + GUI: Support for the GUI continues. + * numerous fixes, improvements and updates + * UTF-8 support * all skin messages available as slave commands (gui <message>) + * fancy new icon Ports: * Wine (see DOCS/tech/crosscompile.txt)

1 0

r34945 - in trunk: gui/ui/gtk/fileselect.c help/help_mp-de.h help/help_mp-en.h
by ib 21 May '12

21 May '12

Author: ib Date: Mon May 21 17:12:18 2012 New Revision: 34945 Log: Enable translation of video and audio file filter items. Modified: trunk/gui/ui/gtk/fileselect.c Changes in other areas also in this revision: Modified: trunk/help/help_mp-de.h trunk/help/help_mp-en.h Modified: trunk/gui/ui/gtk/fileselect.c ============================================================================== --- trunk/gui/ui/gtk/fileselect.c Mon May 21 16:45:15 2012 (r34944) +++ trunk/gui/ui/gtk/fileselect.c Mon May 21 17:12:18 2012 (r34945) @@ -63,24 +63,24 @@ static gint fsCurrFNameListSelected, char * fsVideoFilterNames[][2] = { - { "AVI files", "*.avi" }, - { "DivX files", "*.divx" }, - { "Flash Video", "*.flv" }, - { "MP3 files", "*.mp3" }, - { "MP4 files", "*.aac,*.f4a,*.f4b,*.f4v,*.m4a,*.m4b,*.m4v,*.mp4" }, - { "MPEG files", "*.m1v,*.m2v,*.mp2,*.mpe,*.mpeg,*.mpg,*.mpga,*.vdr,*.vob" }, - { "MPEG-2 transport streams", "*.bdm,*.bdmv,*.clpi,*.cpi,*.m2t,*.m2ts,*.mpl,*.mpls,*.mts,*.rec,*.trp,*.ts,*.ty" }, - { "Matroska media", "*.mka,*.mkv" }, - { "OGG media", "*.oga,*.ogg,*.ogm,*.ogv,*.ogx,*.spx" }, - { "QuickTime media", "*.moov,*.mov,*.qt,*.qtvr" }, - { "RealNetworks media", "*.ra,*.rm,*.rmvb,*.rv" }, - { "VCD/SVCD images", "*.bin" }, - { "WAV files", "*.wav" }, - { "Windows media", "*.asf,*.wma,*.wmv" }, - { "Playlists", "*.asx,*.m3u,*.m3u8,*.pls,*.ram,*.rmj,*.rmm,*.smi,*.smil,*.sml,*.vlc,*.wax,*.wmx,*.wvx" }, - { "Audio files", "*.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" }, - { "Video files", "*.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" }, - { "All files", "*" }, + { MSGTR_Filter_AVIFiles, "*.avi" }, + { MSGTR_Filter_DivXFiles, "*.divx" }, + { MSGTR_Filter_FlashVideo, "*.flv" }, + { MSGTR_Filter_MP3Files, "*.mp3" }, + { MSGTR_Filter_MP4Files, "*.aac,*.f4a,*.f4b,*.f4v,*.m4a,*.m4b,*.m4v,*.mp4" }, + { MSGTR_Filter_MPEGFiles, "*.m1v,*.m2v,*.mp2,*.mpe,*.mpeg,*.mpg,*.mpga,*.vdr,*.vob" }, + { MSGTR_Filter_MP2TS, "*.bdm,*.bdmv,*.clpi,*.cpi,*.m2t,*.m2ts,*.mpl,*.mpls,*.mts,*.rec,*.trp,*.ts,*.ty" }, + { MSGTR_Filter_MatroskaMedia, "*.mka,*.mkv" }, + { MSGTR_Filter_OGGMedia, "*.oga,*.ogg,*.ogm,*.ogv,*.ogx,*.spx" }, + { MSGTR_Filter_QTMedia, "*.moov,*.mov,*.qt,*.qtvr" }, + { MSGTR_Filter_RNMedia, "*.ra,*.rm,*.rmvb,*.rv" }, + { MSGTR_Filter_VideoCDImages, "*.bin" }, + { MSGTR_Filter_WAVFiles, "*.wav" }, + { MSGTR_Filter_WindowsMedia, "*.asf,*.wma,*.wmv" }, + { MSGTR_Filter_Playlists, "*.asx,*.m3u,*.m3u8,*.pls,*.ram,*.rmj,*.rmm,*.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, "*" }, { NULL,NULL } }; int fsLastVideoFilterSelected = -1;

1 0

r34944 - trunk/gui/ui/gtk/fileselect.c
by ib 21 May '12

21 May '12

Author: ib Date: Mon May 21 16:45:15 2012 New Revision: 34944 Log: Cosmetic: Arrange all file extensions alphabetically. Modified: trunk/gui/ui/gtk/fileselect.c Modified: trunk/gui/ui/gtk/fileselect.c ============================================================================== --- trunk/gui/ui/gtk/fileselect.c Mon May 21 16:41:18 2012 (r34943) +++ trunk/gui/ui/gtk/fileselect.c Mon May 21 16:45:15 2012 (r34944) @@ -112,12 +112,12 @@ char * fsOtherFilterNames[][2] = char * fsAudioFileNames[][2] = { { MSGTR_Filter_DDRawAudio, "*.ac3,*.pcm" }, - { MSGTR_Filter_MPEGAudio, "*.mp2,*.mp3,*.mpga,*.m4a,*.aac,*.f4a" }, + { MSGTR_Filter_MPEGAudio, "*.aac,*.f4a,*.m4a,*.mp2,*.mp3,*.mpga" }, { MSGTR_Filter_MatroskaAudio, "*.mka" }, { MSGTR_Filter_OGGAudio, "*.oga,*.ogg,*.spx" }, { MSGTR_Filter_WAVAudio, "*.wav" }, { MSGTR_Filter_WMAAudio, "*.wma" }, - { MSGTR_Filter_AllAudioFiles, "*.ac3,*.pcm,*.mp2,*.mp3,*.mpga,*.m4a,*.aac,*.f4a,*.mka,*.oga,*.ogg,*.spx,*.wav,*.wma" }, + { MSGTR_Filter_AllAudioFiles, "*.aac,*.ac3,*.f4a,*.m4a,*.mka,*.mp2,*.mp3,*.mpga,*.oga,*.ogg,*.pcm,*.spx,*.wav,*.wma" }, { MSGTR_Filter_AllFiles, "*" }, { NULL, NULL } }; @@ -128,7 +128,7 @@ char * fsFontFileNames[][2] = #ifdef CONFIG_FREETYPE { MSGTR_Filter_TTF, "*.ttf" }, { MSGTR_Filter_Type1, "*.pfb" }, - { MSGTR_Filter_AllFonts, "*.ttf,*.pfb" }, + { MSGTR_Filter_AllFonts, "*.pfb,*.ttf" }, #else { MSGTR_Filter_FontFiles, "*.desc" }, #endif

1 0

r34943 - trunk/gui/ui/gtk/fileselect.c
by ib 21 May '12

21 May '12

Author: ib Date: Mon May 21 16:41:18 2012 New Revision: 34943 Log: Update video and audio file filter for file selector. Additionally: Reduce categories, revise descriptive names and add category "playlists". Modified: trunk/gui/ui/gtk/fileselect.c Modified: trunk/gui/ui/gtk/fileselect.c ============================================================================== --- trunk/gui/ui/gtk/fileselect.c Mon May 21 13:56:52 2012 (r34942) +++ trunk/gui/ui/gtk/fileselect.c Mon May 21 16:41:18 2012 (r34943) @@ -63,31 +63,24 @@ static gint fsCurrFNameListSelected, char * fsVideoFilterNames[][2] = { - { "ASF files (*.asf)", "*.asf" }, - { "AVI files (*.avi)", "*.avi" }, - { "Autodesk animations (*.fli,*.flc)", "*.fli,*.flc" }, - { "DGStation Cuberevo recordings (*.trp)", "*.trp" }, - { "DiVX files (*.divx)", "*.divx" }, - { "MP3 files (*.mp3,*.mp2)", "*.mp3,*.mp2" }, - { "MPEG files (*.mpg,*.mpeg,*.m1v)", "*.mpg,*.mpeg,*.m1v" }, - { "Macromedia Flash Video (*.flv)", "*.flv" }, - { "Matroska Audio files (*.mka)", "*.mka" }, - { "Matroska Media files (*.mkv)", "*.mkv" }, - { "NuppelVideo files (*.nuv)", "*.nuv" }, - { "OGG Vorbis files (*.ogg)", "*.ogg" }, - { "OGG Media files (*.ogm)", "*.ogm" }, - { "QuickTime files (*.mov,*.qt,*.mp4)", "*.mov,*.qt,*.mp4" }, - { "RealVideo files (*.rm,*.rmvb)", "*.rm,*.rmvb" }, - { "Tivo files (*.ty)", "*.ty" }, - { "VCD/SVCD Images (*.bin)", "*.bin" }, - { "VIVO files (*.viv)", "*.viv" }, - { "VOB files (*.vob)", "*.vob" }, - { "Wave files (*.wav)", "*.wav" }, - { "Windows Media Audio (*.wma)", "*.wma" }, - { "Windows Media Video (*.wmv)", "*.wmv" }, - { "Audio files", "*.mp2,*.mp3,*.mka,*.ogg,*.wav,*.wma" }, - { "Video files", "*.asf,*.avi,*.fli,*.flc,*.trp,*.divx,*.mpg,*.mpeg,*.m1v,*.flv,*.mkv,*.nuv,*.ogm,*.mov,*.qt,*.mp4,*.rm,*.rmvb,*.ty,*.bin,*.viv,*.vob,*.wmv" }, - { "All files", "*" }, + { "AVI files", "*.avi" }, + { "DivX files", "*.divx" }, + { "Flash Video", "*.flv" }, + { "MP3 files", "*.mp3" }, + { "MP4 files", "*.aac,*.f4a,*.f4b,*.f4v,*.m4a,*.m4b,*.m4v,*.mp4" }, + { "MPEG files", "*.m1v,*.m2v,*.mp2,*.mpe,*.mpeg,*.mpg,*.mpga,*.vdr,*.vob" }, + { "MPEG-2 transport streams", "*.bdm,*.bdmv,*.clpi,*.cpi,*.m2t,*.m2ts,*.mpl,*.mpls,*.mts,*.rec,*.trp,*.ts,*.ty" }, + { "Matroska media", "*.mka,*.mkv" }, + { "OGG media", "*.oga,*.ogg,*.ogm,*.ogv,*.ogx,*.spx" }, + { "QuickTime media", "*.moov,*.mov,*.qt,*.qtvr" }, + { "RealNetworks media", "*.ra,*.rm,*.rmvb,*.rv" }, + { "VCD/SVCD images", "*.bin" }, + { "WAV files", "*.wav" }, + { "Windows media", "*.asf,*.wma,*.wmv" }, + { "Playlists", "*.asx,*.m3u,*.m3u8,*.pls,*.ram,*.rmj,*.rmm,*.smi,*.smil,*.sml,*.vlc,*.wax,*.wmx,*.wvx" }, + { "Audio files", "*.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" }, + { "Video files", "*.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" }, + { "All files", "*" }, { NULL,NULL } }; int fsLastVideoFilterSelected = -1;

1 0

r34942 - trunk/gui/ui/gtk/fileselect.c
by ib 21 May '12

21 May '12

Author: ib Date: Mon May 21 13:56:52 2012 New Revision: 34942 Log: Enable translation of other file filter item. Modified: trunk/gui/ui/gtk/fileselect.c Modified: trunk/gui/ui/gtk/fileselect.c ============================================================================== --- trunk/gui/ui/gtk/fileselect.c Mon May 21 13:34:45 2012 (r34941) +++ trunk/gui/ui/gtk/fileselect.c Mon May 21 13:56:52 2012 (r34942) @@ -112,7 +112,7 @@ int fsLastSubtitleFilterSelected = -1; char * fsOtherFilterNames[][2] = { - { "All files", "*" }, + { MSGTR_Filter_AllFiles, "*" }, { NULL,NULL } };

1 0

r34941 - in trunk: gui/ui/gtk/fileselect.c help/help_mp-de.h help/help_mp-en.h
by ib 21 May '12

21 May '12

Author: ib Date: Mon May 21 13:34:45 2012 New Revision: 34941 Log: Enable translation of external audio file filter items. Modified: trunk/gui/ui/gtk/fileselect.c Changes in other areas also in this revision: Modified: trunk/help/help_mp-de.h trunk/help/help_mp-en.h Modified: trunk/gui/ui/gtk/fileselect.c ============================================================================== --- trunk/gui/ui/gtk/fileselect.c Mon May 21 13:16:25 2012 (r34940) +++ trunk/gui/ui/gtk/fileselect.c Mon May 21 13:34:45 2012 (r34941) @@ -118,14 +118,14 @@ char * fsOtherFilterNames[][2] = char * fsAudioFileNames[][2] = { - { "Dolby Digital / Raw audio (*.ac3, *.pcm)", "*.ac3,*.pcm" }, - { "MPEG audio (*.mp2, *.mp3, *.mpga, *.m4a, *.aac, *.f4a)", "*.mp2,*.mp3,*.mpga,*.m4a,*.aac,*.f4a" }, - { "Matroska audio (*.mka)", "*.mka" }, - { "Ogg audio (*.oga, *.ogg, *.spx)", "*.oga,*.ogg,*.spx" }, - { "WAV audio (*.wav)", "*.wav" }, - { "Windows Media audio (*.wma)", "*.wma" }, - { "All audio files", "*.ac3,*.pcm,*.mp2,*.mp3,*.mpga,*.m4a,*.aac,*.f4a,*.mka,*.oga,*.ogg,*.spx,*.wav,*.wma" }, - { "All files", "*" }, + { MSGTR_Filter_DDRawAudio, "*.ac3,*.pcm" }, + { MSGTR_Filter_MPEGAudio, "*.mp2,*.mp3,*.mpga,*.m4a,*.aac,*.f4a" }, + { MSGTR_Filter_MatroskaAudio, "*.mka" }, + { MSGTR_Filter_OGGAudio, "*.oga,*.ogg,*.spx" }, + { MSGTR_Filter_WAVAudio, "*.wav" }, + { MSGTR_Filter_WMAAudio, "*.wma" }, + { MSGTR_Filter_AllAudioFiles, "*.ac3,*.pcm,*.mp2,*.mp3,*.mpga,*.m4a,*.aac,*.f4a,*.mka,*.oga,*.ogg,*.spx,*.wav,*.wma" }, + { MSGTR_Filter_AllFiles, "*" }, { NULL, NULL } }; int fsLastAudioFilterSelected = -1;

1 0

r34940 - trunk/gui/ui/gtk/fileselect.c
by ib 21 May '12

21 May '12

Author: ib Date: Mon May 21 13:16:25 2012 New Revision: 34940 Log: Update external audio file filter for file selector. Additionally, revise descriptive names. Modified: trunk/gui/ui/gtk/fileselect.c Modified: trunk/gui/ui/gtk/fileselect.c ============================================================================== --- trunk/gui/ui/gtk/fileselect.c Mon May 21 12:33:08 2012 (r34939) +++ trunk/gui/ui/gtk/fileselect.c Mon May 21 13:16:25 2012 (r34940) @@ -118,13 +118,14 @@ char * fsOtherFilterNames[][2] = char * fsAudioFileNames[][2] = { - { "MP3 files (*.mp2, *.mp3)", "*.mp2,*.mp3" }, - { "Matroska Audio files (*.mka)", "*.mka" }, - { "OGG Vorbis files (*.ogg)", "*.ogg" }, - { "WAV files (*.wav)", "*.wav" }, - { "WMA files (*.wma)", "*.wma" }, - { "Audio files", "*.mp2,*.mp3,*.mka,*.ogg,*.wav,*.wma" }, - { "All files", "*" }, + { "Dolby Digital / Raw audio (*.ac3, *.pcm)", "*.ac3,*.pcm" }, + { "MPEG audio (*.mp2, *.mp3, *.mpga, *.m4a, *.aac, *.f4a)", "*.mp2,*.mp3,*.mpga,*.m4a,*.aac,*.f4a" }, + { "Matroska audio (*.mka)", "*.mka" }, + { "Ogg audio (*.oga, *.ogg, *.spx)", "*.oga,*.ogg,*.spx" }, + { "WAV audio (*.wav)", "*.wav" }, + { "Windows Media audio (*.wma)", "*.wma" }, + { "All audio files", "*.ac3,*.pcm,*.mp2,*.mp3,*.mpga,*.m4a,*.aac,*.f4a,*.mka,*.oga,*.ogg,*.spx,*.wav,*.wma" }, + { "All files", "*" }, { NULL, NULL } }; int fsLastAudioFilterSelected = -1;

1 0