March 2013 - MPlayer-cvslog - lists.mplayerhq.hu

r36109 - trunk/gui/dialog/fileselect.c
by ib 31 Mar '13

31 Mar '13

Author: ib Date: Sun Mar 31 05:57:53 2013 New Revision: 36109 Log: Rephrase positively. Additionally, add #include for PATH_MAX. Modified: trunk/gui/dialog/fileselect.c Modified: trunk/gui/dialog/fileselect.c ============================================================================== --- trunk/gui/dialog/fileselect.c Sun Mar 31 05:32:17 2013 (r36108) +++ trunk/gui/dialog/fileselect.c Sun Mar 31 05:57:53 2013 (r36109) @@ -48,10 +48,11 @@ #include "mpcommon.h" #include "stream/stream.h" -#ifndef __linux__ -#define get_current_dir_name() getcwd(NULL, PATH_MAX) -#else +#ifdef __linux__ char *get_current_dir_name(void); +#else +#include <limits.h> +#define get_current_dir_name() getcwd(NULL, PATH_MAX) #endif const char *fsSelectedFile = NULL;

1 0

r36108 - trunk/gui/dialog/fileselect.c
by ib 31 Mar '13

31 Mar '13

Author: ib Date: Sun Mar 31 05:32:17 2013 New Revision: 36108 Log: Add, group and sort #includes, remove unneeded ones. Modified: trunk/gui/dialog/fileselect.c Modified: trunk/gui/dialog/fileselect.c ============================================================================== --- trunk/gui/dialog/fileselect.c Sun Mar 31 04:38:38 2013 (r36107) +++ trunk/gui/dialog/fileselect.c Sun Mar 31 05:32:17 2013 (r36108) @@ -16,40 +16,38 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include <glob.h> #include <stdlib.h> -#include <stdio.h> #include <string.h> #include <strings.h> #include <sys/stat.h> -#include <glob.h> #include <unistd.h> -#include "config.h" -#include "gui/ui/actions.h" - -#include "pixmaps/up.xpm" +#include "fileselect.h" +#include "dialog.h" +#include "preferences.h" +#include "tools.h" #include "pixmaps/dir.xpm" #include "pixmaps/file.xpm" - +#include "pixmaps/up.xpm" #include "gui/app/app.h" +#include "gui/app/cfg.h" #include "gui/app/gui.h" #include "gui/interface.h" +#include "gui/ui/actions.h" #include "gui/util/list.h" #include "gui/util/mem.h" #include "gui/util/string.h" -#include "help_mp.h" -#include "mpcommon.h" -#include "stream/stream.h" -#include "libavutil/common.h" - -#include "dialog.h" -#include "fileselect.h" -#include "preferences.h" -#include "tools.h" #define CFG_OLD_FILESELECT #include "gui/app/cfg-old.c" +#include "config.h" +#include "help_mp.h" +#include "libavutil/common.h" +#include "mpcommon.h" +#include "stream/stream.h" + #ifndef __linux__ #define get_current_dir_name() getcwd(NULL, PATH_MAX) #else

1 0

r36107 - trunk/gui/skin/font.c
by ib 31 Mar '13

31 Mar '13

Author: ib Date: Sun Mar 31 04:38:38 2013 New Revision: 36107 Log: Replace #include. We only need GLib. Modified: trunk/gui/skin/font.c Modified: trunk/gui/skin/font.c ============================================================================== --- trunk/gui/skin/font.c Sun Mar 31 03:24:57 2013 (r36106) +++ trunk/gui/skin/font.c Sun Mar 31 04:38:38 2013 (r36107) @@ -21,7 +21,7 @@ * @brief Font file parser and font rendering */ -#include <gtk/gtk.h> +#include <glib.h> #include <stdint.h> #include <stdlib.h> #include <string.h>

1 0

r36106 - trunk/gui/dialog/fileselect.c
by ib 31 Mar '13

31 Mar '13

Author: ib Date: Sun Mar 31 03:24:57 2013 New Revision: 36106 Log: Cosmetic: Format to MPlayer coding style. Modified: trunk/gui/dialog/fileselect.c Modified: trunk/gui/dialog/fileselect.c ============================================================================== --- trunk/gui/dialog/fileselect.c Sun Mar 31 03:20:18 2013 (r36105) +++ trunk/gui/dialog/fileselect.c Sun Mar 31 03:24:57 2013 (r36106) @@ -53,737 +53,817 @@ #ifndef __linux__ #define get_current_dir_name() getcwd(NULL, PATH_MAX) #else -char * get_current_dir_name( void ); +char *get_current_dir_name(void); #endif -const char * fsSelectedFile = NULL; -const char * fsThisDir = "."; -const gchar * fsFilter = "*"; +const char *fsSelectedFile = NULL; +const char *fsThisDir = "."; +const gchar *fsFilter = "*"; -int fsType = 0; +int fsType = 0; -static gint fsCurrFNameListSelected, fsLastFNameListSelected; +static gint fsCurrFNameListSelected, fsLastFNameListSelected; -char * fsVideoAudioFilterNames[][2] = - { - { 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,*.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,*.tak,*.voc,*.vqf,*.w64,*.wav,*.wma,*.wv,*.wvp" }, - { MSGTR_Filter_AllVideoFiles, "*.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_Filter_AllFiles, "*" }, - { NULL,NULL } - }; +char *fsVideoAudioFilterNames[][2] = { + { 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,*.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,*.tak,*.voc,*.vqf,*.w64,*.wav,*.wma,*.wv,*.wvp" }, + { MSGTR_Filter_AllVideoFiles, "*.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_Filter_AllFiles, "*" }, + { NULL, NULL } +}; int fsLastVideoAudioFilterSelected = -1; -char * fsSubtitleFilterNames[][2] = - { - { "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" }, - { MSGTR_Filter_UTF8Subtitles, "*.utf,*.utf-8,*.utf8" }, - { MSGTR_Filter_AllSubtitles, "*.aqt,*.ass,*.jss,*.rt,*.smi,*.srt,*.ssa,*.sub,*.txt,*.utf" }, - { MSGTR_Filter_AllFiles, "*" }, - { NULL,NULL } - }; +char *fsSubtitleFilterNames[][2] = { + { "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" }, + { MSGTR_Filter_UTF8Subtitles, "*.utf,*.utf-8,*.utf8" }, + { MSGTR_Filter_AllSubtitles, "*.aqt,*.ass,*.jss,*.rt,*.smi,*.srt,*.ssa,*.sub,*.txt,*.utf" }, + { MSGTR_Filter_AllFiles, "*" }, + { NULL, NULL } +}; int fsLastSubtitleFilterSelected = -1; -char * fsOtherFilterNames[][2] = - { - { MSGTR_Filter_AllFiles, "*" }, - { NULL,NULL } - }; +char *fsOtherFilterNames[][2] = { + { MSGTR_Filter_AllFiles, "*" }, + { NULL, NULL } +}; -char * fsAudioFileNames[][2] = - { - { MSGTR_Filter_DDRawAudio, "*.ac3,*.pcm" }, - { 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, "*.aac,*.ac3,*.f4a,*.m4a,*.mka,*.mp2,*.mp3,*.mpga,*.oga,*.ogg,*.pcm,*.spx,*.wav,*.wma" }, - { MSGTR_Filter_AllFiles, "*" }, - { NULL, NULL } - }; +char *fsAudioFileNames[][2] = { + { MSGTR_Filter_DDRawAudio, "*.ac3,*.pcm" }, + { 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, "*.aac,*.ac3,*.f4a,*.m4a,*.mka,*.mp2,*.mp3,*.mpga,*.oga,*.ogg,*.pcm,*.spx,*.wav,*.wma" }, + { MSGTR_Filter_AllFiles, "*" }, + { NULL, NULL } +}; int fsLastAudioFilterSelected = -1; -char * fsFontFileNames[][2] = - { +char *fsFontFileNames[][2] = { #ifdef CONFIG_FREETYPE - { MSGTR_Filter_TTF, "*.ttf" }, - { MSGTR_Filter_Type1, "*.pfb" }, - { MSGTR_Filter_AllFonts, "*.pfb,*.ttf" }, + { MSGTR_Filter_TTF, "*.ttf" }, + { MSGTR_Filter_Type1, "*.pfb" }, + { MSGTR_Filter_AllFonts, "*.pfb,*.ttf" }, #else - { MSGTR_Filter_FontFiles, "*.desc" }, + { MSGTR_Filter_FontFiles, "*.desc" }, #endif - { MSGTR_Filter_AllFiles, "*" }, - { NULL,NULL } - }; + { MSGTR_Filter_AllFiles, "*" }, + { NULL, NULL } +}; int fsLastFontFilterSelected = -1; -GtkWidget * fsFileNamesList; -GtkWidget * fsFNameList; -GtkWidget * FileSelector = NULL; -GdkColormap * fsColorMap; -GtkWidget * fsOk; -GtkWidget * fsUp; -GtkWidget * fsCancel; -GtkWidget * fsCombo4; -GtkWidget * fsPathCombo; -GList * fsList_items = NULL; -GList * fsTopList_items = NULL; -GHashTable * fsPathTable; -GtkWidget * List; -GtkWidget * fsFilterCombo; +GtkWidget *fsFileNamesList; +GtkWidget *fsFNameList; +GtkWidget *FileSelector = NULL; +GdkColormap *fsColorMap; +GtkWidget *fsOk; +GtkWidget *fsUp; +GtkWidget *fsCancel; +GtkWidget *fsCombo4; +GtkWidget *fsPathCombo; +GList *fsList_items = NULL; +GList *fsTopList_items = NULL; +GHashTable *fsPathTable; +GtkWidget *List; +GtkWidget *fsFilterCombo; -GtkStyle * style; -GdkPixmap * dpixmap; -GdkPixmap * fpixmap; -GdkBitmap * dmask; -GdkBitmap * fmask; +GtkStyle *style; +GdkPixmap *dpixmap; +GdkPixmap *fpixmap; +GdkBitmap *dmask; +GdkBitmap *fmask; -static gchar * get_current_dir_name_utf8( void ) +static gchar *get_current_dir_name_utf8(void) { - char * dir; - gchar * utf8dir; - dir = get_current_dir_name(); - utf8dir = g_filename_display_name( dir ); - free( dir ); - return utf8dir; + char *dir; + gchar *utf8dir; + + dir = get_current_dir_name(); + utf8dir = g_filename_display_name(dir); + free(dir); + + return utf8dir; } -static void clist_append_fname(GtkWidget * list, char *fname, - GdkPixmap *pixmap, GdkPixmap *mask) { - gint pos; - gchar *str[2]; - str[0] = NULL; - str[1] = g_filename_display_name(fname); - pos = gtk_clist_append(GTK_CLIST(list), str); - gtk_clist_set_row_data_full(GTK_CLIST(list), pos, strdup(fname), free); - gtk_clist_set_pixmap(GTK_CLIST(list), pos, 0, pixmap, mask); - g_free(str[1]); +static void clist_append_fname(GtkWidget *list, char *fname, + GdkPixmap *pixmap, GdkPixmap *mask) +{ + gint pos; + gchar *str[2]; + + str[0] = NULL; + str[1] = g_filename_display_name(fname); + pos = gtk_clist_append(GTK_CLIST(list), str); + gtk_clist_set_row_data_full(GTK_CLIST(list), pos, strdup(fname), free); + gtk_clist_set_pixmap(GTK_CLIST(list), pos, 0, pixmap, mask); + g_free(str[1]); } -static void CheckDir( GtkWidget * list ) +static void CheckDir(GtkWidget *list) { - struct stat fs; - unsigned int i, j, fn; - glob_t gg; - gchar *filter, **fext; + struct stat fs; + unsigned int i, j, fn; + glob_t gg; + gchar *filter, **fext; - if ( !fsFilter[0] ) return; + if (!fsFilter[0]) + return; - gtk_widget_hide( list ); - gtk_clist_clear( GTK_CLIST( list ) ); + gtk_widget_hide(list); + gtk_clist_clear(GTK_CLIST(list)); - clist_append_fname(list, ".", dpixmap, dmask); - clist_append_fname(list, "..", dpixmap, dmask); + clist_append_fname(list, ".", dpixmap, dmask); + clist_append_fname(list, "..", dpixmap, dmask); - glob( "*",0,NULL,&gg ); - for( i=0;i<gg.gl_pathc;i++ ) - { - if( ( stat( gg.gl_pathv[i],&fs ) != 0 ) || !S_ISDIR( fs.st_mode ) ) continue; - clist_append_fname(list, gg.gl_pathv[i], dpixmap, dmask); - } + glob("*", 0, NULL, &gg); - for (fn = 1, i = 0; fsFilter[i]; i++) - if (fsFilter[i] == ',') fn++; + for (i = 0; i < gg.gl_pathc; i++) { + if ((stat(gg.gl_pathv[i], &fs) != 0) || !S_ISDIR(fs.st_mode)) + continue; - filter = g_strdup(fsFilter); - fext = calloc(fn, sizeof(gchar *)); + clist_append_fname(list, gg.gl_pathv[i], dpixmap, dmask); + } - if (filter && fext) - { - for (j = 0, i = 0; filter[i]; i++) - { - if (filter[i] == '.') fext[j] = filter + i; + for (fn = 1, i = 0; fsFilter[i]; i++) + if (fsFilter[i] == ',') + fn++; - if (filter[i] == ',') - { - filter[i] = 0; - j++; - } - } + filter = g_strdup(fsFilter); + fext = calloc(fn, sizeof(gchar *)); - for( i=0;i<gg.gl_pathc;i++ ) - { - char *ext; + if (filter && fext) { + for (j = 0, i = 0; filter[i]; i++) { + if (filter[i] == '.') + fext[j] = filter + i; - if( ( stat( gg.gl_pathv[i],&fs ) != 0 ) || S_ISDIR( fs.st_mode ) ) continue; + if (filter[i] == ',') { + filter[i] = 0; + j++; + } + } - ext = strrchr(gg.gl_pathv[i], '.'); + for (i = 0; i < gg.gl_pathc; i++) { + char *ext; - if (ext || !fext[0]) - { - for (j = 0; j < fn; j++) - { - if (fext[j] == NULL || strcasecmp(fext[j], ext) == 0) - { - clist_append_fname(list, gg.gl_pathv[i], fpixmap, fmask); - break; - } - } - } - } - } + if ((stat(gg.gl_pathv[i], &fs) != 0) || S_ISDIR(fs.st_mode)) + continue; - free(fext); - g_free(filter); - globfree( &gg ); + ext = strrchr(gg.gl_pathv[i], '.'); - gtk_clist_set_column_width( GTK_CLIST( list ),0,17 ); - gtk_widget_show( list ); + if (ext || !fext[0]) { + for (j = 0; j < fn; j++) { + if (fext[j] == NULL || strcasecmp(fext[j], ext) == 0) { + clist_append_fname(list, gg.gl_pathv[i], fpixmap, fmask); + break; + } + } + } + } + } + + free(fext); + g_free(filter); + globfree(&gg); + + gtk_clist_set_column_width(GTK_CLIST(list), 0, 17); + gtk_widget_show(list); } -static GList *fs_AddPath (GList *list, gpointer data, GtkPositionType pos) +static GList *fs_AddPath(GList *list, gpointer data, GtkPositionType pos) { - if (!g_list_find_custom(list, data, (GCompareFunc) strcmp)) - { - if (pos == GTK_POS_TOP) list = g_list_prepend(list, data); - else list = g_list_append(list, data); - } + if (!g_list_find_custom(list, data, (GCompareFunc)strcmp)) { + if (pos == GTK_POS_TOP) + list = g_list_prepend(list, data); + else + list = g_list_append(list, data); + } - return list; + return list; } -static void fs_AddPathUtf8 (const char *name, GtkPositionType pos) +static void fs_AddPathUtf8(const char *name, GtkPositionType pos) { - gchar *utf8name; + gchar *utf8name; - utf8name = g_filename_display_name(name); - fsTopList_items = fs_AddPath(fsTopList_items, utf8name, pos); - g_hash_table_insert(fsPathTable, strdup(utf8name), strdup(name)); + utf8name = g_filename_display_name(name); + fsTopList_items = fs_AddPath(fsTopList_items, utf8name, pos); + g_hash_table_insert(fsPathTable, strdup(utf8name), strdup(name)); } -static void fs_PersistantHistory( char * subject ) +static void fs_PersistantHistory(char *subject) { - unsigned int i; - char * entry; + unsigned int i; + char *entry; - if ( !subject ) return; + if (!subject) + return; - for ( i=0;i < FF_ARRAY_ELEMS(fsHistory);i++ ) - if ( gstrcmp( fsHistory[i],subject ) == 0 ) - { - entry=fsHistory[i]; - break; - } - if ( i == FF_ARRAY_ELEMS(fsHistory) ) - { - entry=strdup( subject ); - free( fsHistory[--i] ); - } - for ( ;i;i-- ) fsHistory[i]=fsHistory[i - 1]; - fsHistory[0]=entry; + for (i = 0; i < FF_ARRAY_ELEMS(fsHistory); i++) + if (gstrcmp(fsHistory[i], subject) == 0) { + entry = fsHistory[i]; + break; + } + + if (i == FF_ARRAY_ELEMS(fsHistory)) { + entry = strdup(subject); + free(fsHistory[--i]); + } + + for (; i; i--) + fsHistory[i] = fsHistory[i - 1]; + + fsHistory[0] = entry; } + /* ----------------------------------------------- */ -static void fs_fsFilterCombo_activate( GtkEntry * entry, - gpointer user_data ) +static void fs_fsFilterCombo_activate(GtkEntry *entry, + gpointer user_data) { - (void) entry; + (void)entry; - fsFilter=gtk_entry_get_text( GTK_ENTRY( user_data ) ); - CheckDir( fsFNameList ); + fsFilter = gtk_entry_get_text(GTK_ENTRY(user_data)); + CheckDir(fsFNameList); } -static void fs_fsFilterCombo_changed( GtkEditable * editable, - gpointer user_data ) +static void fs_fsFilterCombo_changed(GtkEditable *editable, + gpointer user_data) { - const char * str; - int i; + const char *str; + int i; - (void) editable; + (void)editable; - str=gtk_entry_get_text( GTK_ENTRY(user_data ) ); + str = gtk_entry_get_text(GTK_ENTRY(user_data)); + + switch (fsType) { + case FILESELECT_VIDEO_AUDIO: + + for (i = 0; fsVideoAudioFilterNames[i][0]; i++) + if (!strcmp(str, fsVideoAudioFilterNames[i][0])) { + fsFilter = fsVideoAudioFilterNames[i][1]; + fsLastVideoAudioFilterSelected = i; + break; + } + + break; + + case FILESELECT_SUBTITLE: + + for (i = 0; fsSubtitleFilterNames[i][0]; i++) + if (!strcmp(str, fsSubtitleFilterNames[i][0])) { + fsFilter = fsSubtitleFilterNames[i][1]; + fsLastSubtitleFilterSelected = i; + break; + } + + break; - switch ( fsType ) - { - case FILESELECT_VIDEO_AUDIO: - for( i=0;fsVideoAudioFilterNames[i][0];i++ ) - if( !strcmp( str,fsVideoAudioFilterNames[i][0] ) ) - { fsFilter=fsVideoAudioFilterNames[i][1]; fsLastVideoAudioFilterSelected = i; break; } - break; - case FILESELECT_SUBTITLE: - for( i=0;fsSubtitleFilterNames[i][0];i++ ) - if( !strcmp( str,fsSubtitleFilterNames[i][0] ) ) - { fsFilter=fsSubtitleFilterNames[i][1]; fsLastSubtitleFilterSelected = i; break; } - break; /* case fsOtherSelector: - for( i=0;fsOtherFilterNames[i][0];i++ ) - if( !strcmp( str,fsOtherFilterNames[i][0] ) ) - { fsFilter=fsOtherFilterNames[i][1]; break; } - break;*/ - case FILESELECT_AUDIO: - for( i=0;fsAudioFileNames[i][0];i++ ) - if( !strcmp( str,fsAudioFileNames[i][0] ) ) - { fsFilter=fsAudioFileNames[i][1]; fsLastAudioFilterSelected = i; break; } - break; - case FILESELECT_FONT: - for( i=0;fsFontFileNames[i][0];i++ ) - if( !strcmp( str,fsFontFileNames[i][0] ) ) - { fsFilter=fsFontFileNames[i][1]; fsLastFontFilterSelected = i; break; } - break; - default: return; - } - CheckDir( fsFNameList ); + * for( i=0;fsOtherFilterNames[i][0];i++ ) + * if( !strcmp( str,fsOtherFilterNames[i][0] ) ) + * { fsFilter=fsOtherFilterNames[i][1]; break; } + * break;*/ + case FILESELECT_AUDIO: + + for (i = 0; fsAudioFileNames[i][0]; i++) + if (!strcmp(str, fsAudioFileNames[i][0])) { + fsFilter = fsAudioFileNames[i][1]; + fsLastAudioFilterSelected = i; + break; + } + + break; + + case FILESELECT_FONT: + + for (i = 0; fsFontFileNames[i][0]; i++) + if (!strcmp(str, fsFontFileNames[i][0])) { + fsFilter = fsFontFileNames[i][1]; + fsLastFontFilterSelected = i; + break; + } + + break; + + default: + + return; + } + + CheckDir(fsFNameList); } -static void fs_fsPathCombo_activate( GtkEntry * entry, - gpointer user_data ) +static void fs_fsPathCombo_activate(GtkEntry *entry, + gpointer user_data) { - const unsigned char * str; - gchar * dirname; + const unsigned char *str; + gchar *dirname; - (void) entry; + (void)entry; - str=gtk_entry_get_text( GTK_ENTRY( user_data ) ); - dirname=g_hash_table_lookup(fsPathTable, str); - if ( chdir( dirname ? (const unsigned char *)dirname : str ) != -1 ) CheckDir( fsFNameList ); + str = gtk_entry_get_text(GTK_ENTRY(user_data)); + dirname = g_hash_table_lookup(fsPathTable, str); + + if (chdir(dirname ? (const unsigned char *)dirname : str) != -1) + CheckDir(fsFNameList); } -static void fs_fsPathCombo_changed( GtkEditable * editable, - gpointer user_data ) +static void fs_fsPathCombo_changed(GtkEditable *editable, + gpointer user_data) { - const unsigned char * str; - gchar * dirname; + const unsigned char *str; + gchar *dirname; - (void) editable; + (void)editable; - str=gtk_entry_get_text( GTK_ENTRY( user_data ) ); - dirname=g_hash_table_lookup(fsPathTable, str); - if ( chdir( dirname ? (const unsigned char *)dirname : str ) != -1 ) CheckDir( fsFNameList ); + str = gtk_entry_get_text(GTK_ENTRY(user_data)); + dirname = g_hash_table_lookup(fsPathTable, str); + + if (chdir(dirname ? (const unsigned char *)dirname : str) != -1) + CheckDir(fsFNameList); } -static void fs_Up_released( GtkButton * button, gpointer user_data ) +static void fs_Up_released(GtkButton *button, gpointer user_data) { - gchar *utf8dir; + gchar *utf8dir; - (void) button; - (void) user_data; + (void)button; + (void)user_data; - chdir( ".." ); - CheckDir( fsFNameList ); - utf8dir = get_current_dir_name_utf8(); - gtk_entry_set_text( GTK_ENTRY( fsPathCombo ),utf8dir ); - g_free(utf8dir); - fsSelectedFile=fsThisDir; - return; + chdir(".."); + CheckDir(fsFNameList); + utf8dir = get_current_dir_name_utf8(); + gtk_entry_set_text(GTK_ENTRY(fsPathCombo), utf8dir); + g_free(utf8dir); + fsSelectedFile = fsThisDir; + + return; } -static void fs_Cancel_released( GtkButton * button,gpointer user_data ) +static void fs_Cancel_released(GtkButton *button, gpointer user_data) { - (void) button; - (void) user_data; + (void)button; + (void)user_data; - gtk_widget_destroy( FileSelector ); - fsLastFNameListSelected = fsCurrFNameListSelected; + gtk_widget_destroy(FileSelector); + fsLastFNameListSelected = fsCurrFNameListSelected; } -static void fs_Ok_released( GtkButton * button, gpointer user_data ) +static void fs_Ok_released(GtkButton *button, gpointer user_data) { - char * fsSelectedDirectory; - int l; - struct stat fs; - gchar * selected; + char *fsSelectedDirectory; + int l; + struct stat fs; + gchar *selected; - (void) button; - (void) user_data; + (void)button; + (void)user_data; - if( ( stat( fsSelectedFile,&fs ) == 0 ) && S_ISDIR( fs.st_mode ) ) - { - gchar *utf8dir; - if ( chdir( fsSelectedFile ) != 0 ) return; - CheckDir( fsFNameList ); - utf8dir = get_current_dir_name_utf8(); - gtk_entry_set_text( GTK_ENTRY( fsPathCombo ),utf8dir ); - g_free(utf8dir); - gtk_widget_grab_focus( fsFNameList ); - fsSelectedFile=fsThisDir; - return; - } + if ((stat(fsSelectedFile, &fs) == 0) && S_ISDIR(fs.st_mode)) { + gchar *utf8dir; - fsSelectedDirectory=get_current_dir_name(); - switch ( fsType ) - { - case FILESELECT_VIDEO_AUDIO: - for (l = 0; fsVideoAudioFilterNames[l][0]; l++) - if (strcmp(fsVideoAudioFilterNames[l][0], MSGTR_Filter_Playlists) == 0) break; - uiSetFile( fsSelectedDirectory,fsSelectedFile, fsLastVideoAudioFilterSelected == l ? STREAMTYPE_PLAYLIST : STREAMTYPE_FILE ); - selected = g_strconcat(fsSelectedDirectory, "/", fsSelectedFile, NULL); - if (selected) - { + if (chdir(fsSelectedFile) != 0) + return; + + CheckDir(fsFNameList); + utf8dir = get_current_dir_name_utf8(); + gtk_entry_set_text(GTK_ENTRY(fsPathCombo), utf8dir); + g_free(utf8dir); + gtk_widget_grab_focus(fsFNameList); + fsSelectedFile = fsThisDir; + + return; + } + + fsSelectedDirectory = get_current_dir_name(); + + switch (fsType) { + case FILESELECT_VIDEO_AUDIO: + + for (l = 0; fsVideoAudioFilterNames[l][0]; l++) + if (strcmp(fsVideoAudioFilterNames[l][0], MSGTR_Filter_Playlists) == 0) + break; + + uiSetFile(fsSelectedDirectory, fsSelectedFile, fsLastVideoAudioFilterSelected == l ? STREAMTYPE_PLAYLIST : STREAMTYPE_FILE); + selected = g_strconcat(fsSelectedDirectory, "/", fsSelectedFile, NULL); + + if (selected) { listMgr(PLAYLIST_DELETE, 0); add_to_gui_playlist(selected, PLAYLIST_ITEM_APPEND); g_free(selected); - } - guiInfo.NewPlay=GUI_FILE_NEW; sub_fps=0; - fs_PersistantHistory( fsSelectedDirectory ); - break; - case FILESELECT_SUBTITLE: - setddup( &guiInfo.SubtitleFilename,fsSelectedDirectory,fsSelectedFile ); - mplayerLoadSubtitle( guiInfo.SubtitleFilename ); - break; + } + + guiInfo.NewPlay = GUI_FILE_NEW; + sub_fps = 0; + fs_PersistantHistory(fsSelectedDirectory); + break; + + case FILESELECT_SUBTITLE: + setddup(&guiInfo.SubtitleFilename, fsSelectedDirectory, fsSelectedFile); + mplayerLoadSubtitle(guiInfo.SubtitleFilename); + break; + /* case fsOtherSelector: - setddup( &guiInfo.Othername,fsSelectedDirectory,fsSelectedFile ); - break;*/ - case FILESELECT_AUDIO: - setddup( &guiInfo.AudioFilename,fsSelectedDirectory,fsSelectedFile ); - break; - case FILESELECT_FONT: - setddup( &font_name,fsSelectedDirectory,fsSelectedFile ); - mplayerLoadFont(); - if ( Preferences ) gtk_entry_set_text( GTK_ENTRY( prEFontName ),font_name ); - break; - } + * setddup( &guiInfo.Othername,fsSelectedDirectory,fsSelectedFile ); + * break;*/ + case FILESELECT_AUDIO: + setddup(&guiInfo.AudioFilename, fsSelectedDirectory, fsSelectedFile); + break; - free(fsSelectedDirectory); + case FILESELECT_FONT: + setddup(&font_name, fsSelectedDirectory, fsSelectedFile); + mplayerLoadFont(); - fs_Cancel_released(NULL, NULL); + if (Preferences) + gtk_entry_set_text(GTK_ENTRY(prEFontName), font_name); - if ( uiLoadPlay ) { uiLoadPlay=False; uiEvent( evPlay,0 ); } - else gui( GUI_SET_STATE,(void *) GUI_STOP ); + break; + } + + free(fsSelectedDirectory); + + fs_Cancel_released(NULL, NULL); + + if (uiLoadPlay) { + uiLoadPlay = False; + uiEvent(evPlay, 0); + } else + gui(GUI_SET_STATE, (void *)GUI_STOP); } -static void fs_fsFNameList_select_row( GtkCList * clist, gint row, gint column, - GdkEvent * event, gpointer user_data) +static void fs_fsFNameList_select_row(GtkCList *clist, gint row, gint column, + GdkEvent *event, gpointer user_data) { - (void) column; - (void) user_data; + (void)column; + (void)user_data; - fsCurrFNameListSelected = row; - fsSelectedFile = gtk_clist_get_row_data(clist, row); - if( event && event->type == GDK_BUTTON_PRESS ) gtk_button_released( GTK_BUTTON( fsOk ) ); + fsCurrFNameListSelected = row; + fsSelectedFile = gtk_clist_get_row_data(clist, row); + + if (event && event->type == GDK_BUTTON_PRESS) + gtk_button_released(GTK_BUTTON(fsOk)); } -static gboolean on_FileSelect_key_release_event( GtkWidget * widget, - GdkEvent * event, - gpointer user_data ) +static gboolean on_FileSelect_key_release_event(GtkWidget *widget, + GdkEvent *event, + gpointer user_data) { - (void) user_data; + (void)user_data; - if ( GTK_WIDGET_TYPE( widget ) == GTK_TYPE_BUTTON ) - { - if (event->key.keyval == GDK_Return) gtk_button_released( GTK_BUTTON( widget ) ); - } - else - { - switch ( event->key.keyval ) - { - case GDK_Escape: - gtk_button_released( GTK_BUTTON( fsCancel ) ); - break; - case GDK_Return: - gtk_button_released( GTK_BUTTON( fsOk ) ); - break; - case GDK_BackSpace: - gtk_button_released( GTK_BUTTON( fsUp ) ); - gtk_widget_grab_focus( fsFNameList ); - break; - } - } - return FALSE; + if (GTK_WIDGET_TYPE(widget) == GTK_TYPE_BUTTON) { + if (event->key.keyval == GDK_Return) + gtk_button_released(GTK_BUTTON(widget)); + } else { + switch (event->key.keyval) { + case GDK_Escape: + gtk_button_released(GTK_BUTTON(fsCancel)); + break; + + case GDK_Return: + gtk_button_released(GTK_BUTTON(fsOk)); + break; + + case GDK_BackSpace: + gtk_button_released(GTK_BUTTON(fsUp)); + gtk_widget_grab_focus(fsFNameList); + break; + } + } + + return FALSE; } -static gboolean fs_fsFNameList_event( GtkWidget * widget, - GdkEvent * event, - gpointer user_data ) +static gboolean fs_fsFNameList_event(GtkWidget *widget, + GdkEvent *event, + gpointer user_data) { - GdkEventButton *bevent; - gint row, col; + GdkEventButton *bevent; + gint row, col; - (void) user_data; + (void)user_data; - bevent = (GdkEventButton *) event; + bevent = (GdkEventButton *)event; - if ( event->type == GDK_BUTTON_RELEASE && bevent->button == 2 ) - { - if ( gtk_clist_get_selection_info( GTK_CLIST( widget ), bevent->x, bevent->y, &row, &col ) ) - { - fsSelectedFile = gtk_clist_get_row_data(GTK_CLIST(widget), row); - gtk_button_released( GTK_BUTTON( fsOk ) ); - return TRUE; + if (event->type == GDK_BUTTON_RELEASE && bevent->button == 2) { + if (gtk_clist_get_selection_info(GTK_CLIST(widget), bevent->x, bevent->y, &row, &col)) { + fsSelectedFile = gtk_clist_get_row_data(GTK_CLIST(widget), row); + gtk_button_released(GTK_BUTTON(fsOk)); + + return TRUE; + } } - } - return FALSE; + return FALSE; } -static void fs_Destroy( void ) +static void fs_Destroy(void) { - gtk_widget_destroyed( FileSelector, &FileSelector ); + gtk_widget_destroyed(FileSelector, &FileSelector); - g_hash_table_destroy( fsPathTable ); + g_hash_table_destroy(fsPathTable); - g_list_foreach(fsTopList_items, (GFunc) g_free, NULL); - g_list_free(fsTopList_items); - fsTopList_items = NULL; + g_list_foreach(fsTopList_items, (GFunc)g_free, NULL); + g_list_free(fsTopList_items); + fsTopList_items = NULL; } -static GtkWidget * CreateFileSelect( void ) +static GtkWidget *CreateFileSelect(void) { - GtkWidget * vbox4; - GtkWidget * hbox4; - GtkWidget * vseparator1; - GtkWidget * hbox6; - GtkWidget * fsFNameListWindow; - GtkWidget * hbuttonbox3; - - GtkWidget * uppixmapwid; - GdkPixmap * uppixmap; - GdkBitmap * upmask; - GtkStyle * upstyle; + GtkWidget *vbox4; + GtkWidget *hbox4; + GtkWidget *vseparator1; + GtkWidget *hbox6; + GtkWidget *fsFNameListWindow; + GtkWidget *hbuttonbox3; + GtkWidget *uppixmapwid; + GdkPixmap *uppixmap; + GdkBitmap *upmask; + GtkStyle *upstyle; - FileSelector=gtk_window_new( GTK_WINDOW_TOPLEVEL ); - gtk_widget_set_name( FileSelector,"FileSelector" ); - gtk_object_set_data( GTK_OBJECT( FileSelector ),"FileSelector",FileSelector ); - gtk_widget_set_usize( FileSelector,512,300 ); - GTK_WIDGET_SET_FLAGS( FileSelector,GTK_CAN_DEFAULT ); - gtk_widget_set_events( FileSelector,GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_FOCUS_CHANGE_MASK | GDK_STRUCTURE_MASK | GDK_PROPERTY_CHANGE_MASK | GDK_VISIBILITY_NOTIFY_MASK ); - gtk_window_set_title( GTK_WINDOW( FileSelector ),MSGTR_FileSelect ); - gtk_window_set_position( GTK_WINDOW( FileSelector ),GTK_WIN_POS_CENTER ); - gtk_window_set_policy( GTK_WINDOW( FileSelector ),TRUE,TRUE,TRUE ); - gtk_window_set_wmclass( GTK_WINDOW( FileSelector ),"FileSelect","MPlayer" ); - fsColorMap=gdk_colormap_get_system(); + FileSelector = gtk_window_new(GTK_WINDOW_TOPLEVEL); + gtk_widget_set_name(FileSelector, "FileSelector"); + gtk_object_set_data(GTK_OBJECT(FileSelector), "FileSelector", FileSelector); + gtk_widget_set_usize(FileSelector, 512, 300); + GTK_WIDGET_SET_FLAGS(FileSelector, GTK_CAN_DEFAULT); + gtk_widget_set_events(FileSelector, GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_FOCUS_CHANGE_MASK | GDK_STRUCTURE_MASK | GDK_PROPERTY_CHANGE_MASK | GDK_VISIBILITY_NOTIFY_MASK); + gtk_window_set_title(GTK_WINDOW(FileSelector), MSGTR_FileSelect); + gtk_window_set_position(GTK_WINDOW(FileSelector), GTK_WIN_POS_CENTER); + gtk_window_set_policy(GTK_WINDOW(FileSelector), TRUE, TRUE, TRUE); + gtk_window_set_wmclass(GTK_WINDOW(FileSelector), "FileSelect", "MPlayer"); + fsColorMap = gdk_colormap_get_system(); - gtk_widget_realize( FileSelector ); - gtkAddIcon( FileSelector ); + gtk_widget_realize(FileSelector); + gtkAddIcon(FileSelector); - style=gtk_widget_get_style( FileSelector ); - dpixmap=gdk_pixmap_colormap_create_from_xpm_d( FileSelector->window,fsColorMap,&dmask,&style->bg[GTK_STATE_NORMAL],(gchar **)dir_xpm ); - fpixmap=gdk_pixmap_colormap_create_from_xpm_d( FileSelector->window,fsColorMap,&fmask,&style->bg[GTK_STATE_NORMAL],(gchar **)file_xpm ); + style = gtk_widget_get_style(FileSelector); + dpixmap = gdk_pixmap_colormap_create_from_xpm_d(FileSelector->window, fsColorMap, &dmask, &style->bg[GTK_STATE_NORMAL], (gchar **)dir_xpm); + fpixmap = gdk_pixmap_colormap_create_from_xpm_d(FileSelector->window, fsColorMap, &fmask, &style->bg[GTK_STATE_NORMAL], (gchar **)file_xpm); - vbox4=AddVBox( AddDialogFrame( FileSelector ),0 ); - hbox4=AddHBox( vbox4,1 ); + vbox4 = AddVBox(AddDialogFrame(FileSelector), 0); + hbox4 = AddHBox(vbox4, 1); - fsCombo4=gtk_combo_new(); - gtk_widget_set_name( fsCombo4,"fsCombo4" ); - gtk_widget_show( fsCombo4 ); - gtk_box_pack_start( GTK_BOX( hbox4 ),fsCombo4,TRUE,TRUE,0 ); - gtk_widget_set_usize( fsCombo4,-2,20 ); + fsCombo4 = gtk_combo_new(); + gtk_widget_set_name(fsCombo4, "fsCombo4"); + gtk_widget_show(fsCombo4); + gtk_box_pack_start(GTK_BOX(hbox4), fsCombo4, TRUE, TRUE, 0); + gtk_widget_set_usize(fsCombo4, -2, 20); - fsPathCombo=GTK_COMBO( fsCombo4 )->entry; - gtk_widget_set_name( fsPathCombo,"fsPathCombo" ); - gtk_widget_show( fsPathCombo ); - gtk_widget_set_usize( fsPathCombo,-2,20 ); + fsPathCombo = GTK_COMBO(fsCombo4)->entry; + gtk_widget_set_name(fsPathCombo, "fsPathCombo"); + gtk_widget_show(fsPathCombo); + gtk_widget_set_usize(fsPathCombo, -2, 20); - vseparator1=gtk_vseparator_new(); - gtk_widget_set_name( vseparator1,"vseparator1" ); - gtk_widget_show( vseparator1 ); - gtk_box_pack_start( GTK_BOX( hbox4 ),vseparator1,FALSE,TRUE,0 ); - gtk_widget_set_usize( vseparator1,7,20 ); + vseparator1 = gtk_vseparator_new(); + gtk_widget_set_name(vseparator1, "vseparator1"); + gtk_widget_show(vseparator1); + gtk_box_pack_start(GTK_BOX(hbox4), vseparator1, FALSE, TRUE, 0); + gtk_widget_set_usize(vseparator1, 7, 20); - upstyle=gtk_widget_get_style( FileSelector ); - uppixmap=gdk_pixmap_colormap_create_from_xpm_d( FileSelector->window,fsColorMap,&upmask,&upstyle->bg[GTK_STATE_NORMAL],(gchar **)up_xpm ); - uppixmapwid=gtk_pixmap_new( uppixmap,upmask ); - gtk_widget_show( uppixmapwid ); + upstyle = gtk_widget_get_style(FileSelector); + uppixmap = gdk_pixmap_colormap_create_from_xpm_d(FileSelector->window, fsColorMap, &upmask, &upstyle->bg[GTK_STATE_NORMAL], (gchar **)up_xpm); + uppixmapwid = gtk_pixmap_new(uppixmap, upmask); + gtk_widget_show(uppixmapwid); - fsUp=gtk_button_new(); - gtk_container_add( GTK_CONTAINER(fsUp ),uppixmapwid ); - gtk_widget_show( fsUp ); - gtk_box_pack_start( GTK_BOX( hbox4 ),fsUp,FALSE,FALSE,0 ); - gtk_widget_set_usize( fsUp,65,15 ); + fsUp = gtk_button_new(); + gtk_container_add(GTK_CONTAINER(fsUp), uppixmapwid); + gtk_widget_show(fsUp); + gtk_box_pack_start(GTK_BOX(hbox4), fsUp, FALSE, FALSE, 0); + gtk_widget_set_usize(fsUp, 65, 15); - AddHSeparator( vbox4 ); + AddHSeparator(vbox4); - hbox6=AddHBox( NULL,0 ); - gtk_box_pack_start( GTK_BOX( vbox4 ),hbox6,TRUE,TRUE,0 ); + hbox6 = AddHBox(NULL, 0); + gtk_box_pack_start(GTK_BOX(vbox4), hbox6, TRUE, TRUE, 0); - fsFNameListWindow=gtk_scrolled_window_new( NULL,NULL ); - gtk_widget_set_name( fsFNameListWindow,"fsFNameListWindow" ); - gtk_widget_show( fsFNameListWindow ); - gtk_box_pack_start( GTK_BOX( hbox6 ),fsFNameListWindow,TRUE,TRUE,0 ); - gtk_widget_set_usize( fsFNameListWindow,-2,145 ); - gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW( fsFNameListWindow ),GTK_POLICY_NEVER,GTK_POLICY_AUTOMATIC ); + fsFNameListWindow = gtk_scrolled_window_new(NULL, NULL); + gtk_widget_set_name(fsFNameListWindow, "fsFNameListWindow"); + gtk_widget_show(fsFNameListWindow); + gtk_box_pack_start(GTK_BOX(hbox6), fsFNameListWindow, TRUE, TRUE, 0); + gtk_widget_set_usize(fsFNameListWindow, -2, 145); + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(fsFNameListWindow), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); - fsFNameList=gtk_clist_new( 2 ); - gtk_widget_set_name( fsFNameList,"fsFNameList" ); - gtk_container_add( GTK_CONTAINER( fsFNameListWindow ),fsFNameList ); - gtk_clist_set_column_width( GTK_CLIST( fsFNameList ),0,80 ); - gtk_clist_set_selection_mode( GTK_CLIST( fsFNameList ),GTK_SELECTION_BROWSE ); - gtk_clist_column_titles_hide( GTK_CLIST( fsFNameList ) ); - gtk_clist_set_shadow_type( GTK_CLIST( fsFNameList ),GTK_SHADOW_ETCHED_OUT ); + fsFNameList = gtk_clist_new(2); + gtk_widget_set_name(fsFNameList, "fsFNameList"); + gtk_container_add(GTK_CONTAINER(fsFNameListWindow), fsFNameList); + gtk_clist_set_column_width(GTK_CLIST(fsFNameList), 0, 80); + gtk_clist_set_selection_mode(GTK_CLIST(fsFNameList), GTK_SELECTION_BROWSE); + gtk_clist_column_titles_hide(GTK_CLIST(fsFNameList)); + gtk_clist_set_shadow_type(GTK_CLIST(fsFNameList), GTK_SHADOW_ETCHED_OUT); - AddHSeparator( vbox4 ); + AddHSeparator(vbox4); - List=gtk_combo_new(); - gtk_widget_set_name( List,"List" ); - gtk_widget_ref( List ); - gtk_object_set_data_full( GTK_OBJECT( FileSelector ),"List",List,(GtkDestroyNotify)gtk_widget_unref ); - gtk_widget_show( List ); - gtk_box_pack_start( GTK_BOX( vbox4 ),List,FALSE,FALSE,0 ); - gtk_widget_set_usize( List,-2,20 ); + List = gtk_combo_new(); + gtk_widget_set_name(List, "List"); + gtk_widget_ref(List); + gtk_object_set_data_full(GTK_OBJECT(FileSelector), "List", List, (GtkDestroyNotify)gtk_widget_unref); + gtk_widget_show(List); + gtk_box_pack_start(GTK_BOX(vbox4), List, FALSE, FALSE, 0); + gtk_widget_set_usize(List, -2, 20); - fsFilterCombo=GTK_COMBO( List )->entry; - gtk_widget_set_name( fsFilterCombo,"fsFilterCombo" ); - gtk_widget_show( fsFilterCombo ); - gtk_entry_set_editable (GTK_ENTRY( fsFilterCombo ),FALSE ); - gtk_widget_set_usize( fsFilterCombo,-2,20 ); + fsFilterCombo = GTK_COMBO(List)->entry; + gtk_widget_set_name(fsFilterCombo, "fsFilterCombo"); + gtk_widget_show(fsFilterCombo); + gtk_entry_set_editable(GTK_ENTRY(fsFilterCombo), FALSE); + gtk_widget_set_usize(fsFilterCombo, -2, 20); - AddHSeparator( vbox4 ); + AddHSeparator(vbox4); - hbuttonbox3=AddHButtonBox( vbox4 ); - gtk_button_box_set_layout( GTK_BUTTON_BOX( hbuttonbox3 ),GTK_BUTTONBOX_END ); - gtk_button_box_set_spacing( GTK_BUTTON_BOX( hbuttonbox3 ),10 ); + hbuttonbox3 = AddHButtonBox(vbox4); + gtk_button_box_set_layout(GTK_BUTTON_BOX(hbuttonbox3), GTK_BUTTONBOX_END); + gtk_button_box_set_spacing(GTK_BUTTON_BOX(hbuttonbox3), 10); - fsOk=AddButton( MSGTR_Ok,hbuttonbox3 ); - fsCancel=AddButton( MSGTR_Cancel,hbuttonbox3 ); + fsOk = AddButton(MSGTR_Ok, hbuttonbox3); + fsCancel = AddButton(MSGTR_Cancel, hbuttonbox3); - gtk_signal_connect( GTK_OBJECT( FileSelector ),"destroy",GTK_SIGNAL_FUNC( fs_Destroy ), NULL ); - gtk_signal_connect( GTK_OBJECT( FileSelector ),"key_release_event",GTK_SIGNAL_FUNC( on_FileSelect_key_release_event ),NULL ); + gtk_signal_connect(GTK_OBJECT(FileSelector), "destroy", GTK_SIGNAL_FUNC(fs_Destroy), NULL); + gtk_signal_connect(GTK_OBJECT(FileSelector), "key_release_event", GTK_SIGNAL_FUNC(on_FileSelect_key_release_event), NULL); - gtk_signal_connect( GTK_OBJECT( fsFilterCombo ),"changed",GTK_SIGNAL_FUNC( fs_fsFilterCombo_changed ),fsFilterCombo ); - gtk_signal_connect( GTK_OBJECT( fsFilterCombo ),"activate",GTK_SIGNAL_FUNC( fs_fsFilterCombo_activate ),fsFilterCombo ); - gtk_signal_connect( GTK_OBJECT( fsPathCombo ),"changed",GTK_SIGNAL_FUNC( fs_fsPathCombo_changed ),fsPathCombo ); - gtk_signal_connect( GTK_OBJECT( fsPathCombo ),"activate",GTK_SIGNAL_FUNC( fs_fsPathCombo_activate ),fsPathCombo ); - gtk_signal_connect( GTK_OBJECT( fsUp ),"released",GTK_SIGNAL_FUNC( fs_Up_released ),fsFNameList ); - gtk_signal_connect( GTK_OBJECT( fsUp ),"key_release_event",GTK_SIGNAL_FUNC( on_FileSelect_key_release_event ),NULL ); - gtk_signal_connect( GTK_OBJECT( fsOk ),"released",GTK_SIGNAL_FUNC( fs_Ok_released ),fsCombo4 ); - gtk_signal_connect( GTK_OBJECT( fsOk ),"key_release_event",GTK_SIGNAL_FUNC( on_FileSelect_key_release_event ),NULL ); - gtk_signal_connect( GTK_OBJECT( fsCancel ),"released",GTK_SIGNAL_FUNC( fs_Cancel_released ),NULL ); - gtk_signal_connect( GTK_OBJECT( fsCancel ),"key_release_event",GTK_SIGNAL_FUNC( on_FileSelect_key_release_event ),NULL ); - gtk_signal_connect( GTK_OBJECT( fsFNameList ),"select_row",(GtkSignalFunc)fs_fsFNameList_select_row,NULL ); - gtk_signal_connect( GTK_OBJECT( fsFNameList ),"event", (GtkSignalFunc)fs_fsFNameList_event,NULL ); + gtk_signal_connect(GTK_OBJECT(fsFilterCombo), "changed", GTK_SIGNAL_FUNC(fs_fsFilterCombo_changed), fsFilterCombo); + gtk_signal_connect(GTK_OBJECT(fsFilterCombo), "activate", GTK_SIGNAL_FUNC(fs_fsFilterCombo_activate), fsFilterCombo); + gtk_signal_connect(GTK_OBJECT(fsPathCombo), "changed", GTK_SIGNAL_FUNC(fs_fsPathCombo_changed), fsPathCombo); + gtk_signal_connect(GTK_OBJECT(fsPathCombo), "activate", GTK_SIGNAL_FUNC(fs_fsPathCombo_activate), fsPathCombo); + gtk_signal_connect(GTK_OBJECT(fsUp), "released", GTK_SIGNAL_FUNC(fs_Up_released), fsFNameList); + gtk_signal_connect(GTK_OBJECT(fsUp), "key_release_event", GTK_SIGNAL_FUNC(on_FileSelect_key_release_event), NULL); + gtk_signal_connect(GTK_OBJECT(fsOk), "released", GTK_SIGNAL_FUNC(fs_Ok_released), fsCombo4); + gtk_signal_connect(GTK_OBJECT(fsOk), "key_release_event", GTK_SIGNAL_FUNC(on_FileSelect_key_release_event), NULL); + gtk_signal_connect(GTK_OBJECT(fsCancel), "released", GTK_SIGNAL_FUNC(fs_Cancel_released), NULL); + gtk_signal_connect(GTK_OBJECT(fsCancel), "key_release_event", GTK_SIGNAL_FUNC(on_FileSelect_key_release_event), NULL); + gtk_signal_connect(GTK_OBJECT(fsFNameList), "select_row", (GtkSignalFunc)fs_fsFNameList_select_row, NULL); + gtk_signal_connect(GTK_OBJECT(fsFNameList), "event", (GtkSignalFunc)fs_fsFNameList_event, NULL); - return FileSelector; + return FileSelector; } -void ShowFileSelector( int type ) +void ShowFileSelector(int type) { - int i, k, fsMedium; - char * tmp = NULL, * dir = NULL; - const gchar *fname; - struct stat f; + int i, k, fsMedium; + char *tmp = NULL, *dir = NULL; + const gchar *fname; + struct stat f; - if ( FileSelector ) gtkActive( FileSelector ); - else FileSelector=CreateFileSelect(); + if (FileSelector) + gtkActive(FileSelector); + else + FileSelector = CreateFileSelect(); - fsType=type; - switch ( type ) - { - case FILESELECT_VIDEO_AUDIO: - gtk_window_set_title( GTK_WINDOW( FileSelector ),MSGTR_FileSelect ); - fsList_items=NULL; - for( i=0;fsVideoAudioFilterNames[i][0];i++ ) - fsList_items=g_list_append( fsList_items,fsVideoAudioFilterNames[i][0] ); - k = fsLastVideoAudioFilterSelected; - gtk_combo_set_popdown_strings( GTK_COMBO( List ),fsList_items ); - g_list_free( fsList_items ); - gtk_entry_set_text( GTK_ENTRY( fsFilterCombo ),fsVideoAudioFilterNames[k >= 0 ? k : i-2][0] ); - //tmp=guiInfo.Filename; + fsType = type; + + switch (type) { + case FILESELECT_VIDEO_AUDIO: + gtk_window_set_title(GTK_WINDOW(FileSelector), MSGTR_FileSelect); + fsList_items = NULL; + + for (i = 0; fsVideoAudioFilterNames[i][0]; i++) + fsList_items = g_list_append(fsList_items, fsVideoAudioFilterNames[i][0]); + + k = fsLastVideoAudioFilterSelected; + gtk_combo_set_popdown_strings(GTK_COMBO(List), fsList_items); + g_list_free(fsList_items); + gtk_entry_set_text(GTK_ENTRY(fsFilterCombo), fsVideoAudioFilterNames[k >= 0 ? k : i - 2][0]); + //tmp=guiInfo.Filename; break; - case FILESELECT_SUBTITLE: - gtk_window_set_title( GTK_WINDOW( FileSelector ),MSGTR_SubtitleSelect ); - fsList_items=NULL; - for( i=0;fsSubtitleFilterNames[i][0];i++ ) - fsList_items=g_list_append( fsList_items,fsSubtitleFilterNames[i][0] ); - k = fsLastSubtitleFilterSelected; - gtk_combo_set_popdown_strings( GTK_COMBO( List ),fsList_items ); - g_list_free( fsList_items ); - gtk_entry_set_text( GTK_ENTRY( fsFilterCombo ),fsSubtitleFilterNames[k >= 0 ? k : i-2][0] ); - tmp=guiInfo.SubtitleFilename; + + case FILESELECT_SUBTITLE: + gtk_window_set_title(GTK_WINDOW(FileSelector), MSGTR_SubtitleSelect); + fsList_items = NULL; + + for (i = 0; fsSubtitleFilterNames[i][0]; i++) + fsList_items = g_list_append(fsList_items, fsSubtitleFilterNames[i][0]); + + k = fsLastSubtitleFilterSelected; + gtk_combo_set_popdown_strings(GTK_COMBO(List), fsList_items); + g_list_free(fsList_items); + gtk_entry_set_text(GTK_ENTRY(fsFilterCombo), fsSubtitleFilterNames[k >= 0 ? k : i - 2][0]); + tmp = guiInfo.SubtitleFilename; break; + /* case fsOtherSelector: - gtk_window_set_title( GTK_WINDOW( FileSelector ),MSGTR_OtherSelect ); - fsList_items=NULL; - for( i=0;fsOtherFilterNames[i][0];i++ ) - fsList_items=g_list_append( fsList_items,fsOtherFilterNames[i][0] ); - gtk_combo_set_popdown_strings( GTK_COMBO( List ),fsList_items ); - g_list_free( fsList_items ); - gtk_entry_set_text( GTK_ENTRY( fsFilterCombo ),fsOtherFilterNames[0][0] ); - tmp=guiInfo.Othername; - break;*/ - case FILESELECT_AUDIO: - gtk_window_set_title( GTK_WINDOW( FileSelector ),MSGTR_AudioFileSelect ); - fsList_items=NULL; - for( i=0;fsAudioFileNames[i][0];i++ ) - fsList_items=g_list_append( fsList_items,fsAudioFileNames[i][0] ); - k = fsLastAudioFilterSelected; - gtk_combo_set_popdown_strings( GTK_COMBO( List ),fsList_items ); - g_list_free( fsList_items ); - gtk_entry_set_text( GTK_ENTRY( fsFilterCombo ),fsAudioFileNames[k >= 0 ? k : i-2][0] ); - tmp=guiInfo.AudioFilename; - break; - case FILESELECT_FONT: - gtk_window_set_title( GTK_WINDOW( FileSelector ),MSGTR_FontSelect ); - fsList_items=NULL; - for( i=0;fsFontFileNames[i][0];i++ ) - fsList_items=g_list_append( fsList_items,fsFontFileNames[i][0] ); - k = fsLastFontFilterSelected; - gtk_combo_set_popdown_strings( GTK_COMBO( List ),fsList_items ); - g_list_free( fsList_items ); - gtk_entry_set_text( GTK_ENTRY( fsFilterCombo ),fsFontFileNames[k >= 0 ? k : i-2][0] ); - tmp=font_name; - break; - } + * gtk_window_set_title( GTK_WINDOW( FileSelector ),MSGTR_OtherSelect ); + * fsList_items=NULL; + * for( i=0;fsOtherFilterNames[i][0];i++ ) + * fsList_items=g_list_append( fsList_items,fsOtherFilterNames[i][0] ); + * gtk_combo_set_popdown_strings( GTK_COMBO( List ),fsList_items ); + * g_list_free( fsList_items ); + * gtk_entry_set_text( GTK_ENTRY( fsFilterCombo ),fsOtherFilterNames[0][0] ); + * tmp=guiInfo.Othername; + * break;*/ + case FILESELECT_AUDIO: + gtk_window_set_title(GTK_WINDOW(FileSelector), MSGTR_AudioFileSelect); + fsList_items = NULL; - fsMedium=(fsType == FILESELECT_VIDEO_AUDIO || fsType == FILESELECT_SUBTITLE || fsType == FILESELECT_AUDIO); + for (i = 0; fsAudioFileNames[i][0]; i++) + fsList_items = g_list_append(fsList_items, fsAudioFileNames[i][0]); - if ( tmp && tmp[0] && !strstr( tmp,"://" ) ) - { - dir = strdup( tmp ); + k = fsLastAudioFilterSelected; + gtk_combo_set_popdown_strings(GTK_COMBO(List), fsList_items); + g_list_free(fsList_items); + gtk_entry_set_text(GTK_ENTRY(fsFilterCombo), fsAudioFileNames[k >= 0 ? k : i - 2][0]); + tmp = guiInfo.AudioFilename; + break; + + case FILESELECT_FONT: + gtk_window_set_title(GTK_WINDOW(FileSelector), MSGTR_FontSelect); + fsList_items = NULL; + + for (i = 0; fsFontFileNames[i][0]; i++) + fsList_items = g_list_append(fsList_items, fsFontFileNames[i][0]); + + k = fsLastFontFilterSelected; + gtk_combo_set_popdown_strings(GTK_COMBO(List), fsList_items); + g_list_free(fsList_items); + gtk_entry_set_text(GTK_ENTRY(fsFilterCombo), fsFontFileNames[k >= 0 ? k : i - 2][0]); + tmp = font_name; + break; + } + + fsMedium = (fsType == FILESELECT_VIDEO_AUDIO || fsType == FILESELECT_SUBTITLE || fsType == FILESELECT_AUDIO); + + if (tmp && tmp[0] && !strstr(tmp, "://")) { + dir = strdup(tmp); + + do { + char *c = strrchr(dir, '/'); + + if ((stat(dir, &f) == 0) && S_ISDIR(f.st_mode)) + break; + + if (c) + *c = 0; + } while (strrchr(dir, '/')); + + if (!dir[0]) + nfree(dir); + } + + fsPathTable = g_hash_table_new_full(g_str_hash, g_str_equal, free, free); - do { - char * c = strrchr( dir,'/' ); - if ( ( stat( dir,&f ) == 0 ) && S_ISDIR( f.st_mode ) ) break; - if ( c ) *c=0; - } while ( strrchr( dir,'/' ) ); + unsigned int i, c = 1; - if ( !dir[0] ) nfree( dir ); - } + if (fsMedium) { + for (i = 0; i < FF_ARRAY_ELEMS(fsHistory); i++) + if (fsHistory[i]) { + fname = cfg_old_filename_from_utf8(fsHistory[i]); + fs_AddPathUtf8(fname, GTK_POS_BOTTOM); - fsPathTable = g_hash_table_new_full(g_str_hash, g_str_equal, free, free); + if (c) + c = gstrcmp(dir, fname); + } + } - { - unsigned int i, c = 1; + if (c && dir) + fs_AddPathUtf8(dir, GTK_POS_TOP); + } + free(dir); + fname = getenv("HOME"); - if ( fsMedium ) - { - for ( i=0;i < FF_ARRAY_ELEMS(fsHistory);i++ ) - if ( fsHistory[i] ) - { - fname = cfg_old_filename_from_utf8(fsHistory[i]); - fs_AddPathUtf8(fname, GTK_POS_BOTTOM); - if ( c ) c=gstrcmp( dir,fname ); - } - } - if ( c && dir ) fs_AddPathUtf8(dir, GTK_POS_TOP); - } - free( dir ); - fname = getenv( "HOME" ); - if ( fname ) fs_AddPathUtf8(fname, GTK_POS_BOTTOM); - else fsTopList_items=fs_AddPath( fsTopList_items,g_strdup( "/home" ),GTK_POS_BOTTOM ); - if (stat( "/media",&f ) == 0) fsTopList_items=fs_AddPath( fsTopList_items,g_strdup( "/media" ),GTK_POS_BOTTOM ); - if (stat( "/mnt",&f ) == 0) fsTopList_items=fs_AddPath( fsTopList_items,g_strdup( "/mnt" ),GTK_POS_BOTTOM ); - fsTopList_items=fs_AddPath( fsTopList_items,g_strdup( "/" ),GTK_POS_BOTTOM ); - gtk_combo_set_popdown_strings( GTK_COMBO( fsCombo4 ),fsTopList_items ); + if (fname) + fs_AddPathUtf8(fname, GTK_POS_BOTTOM); + else + fsTopList_items = fs_AddPath(fsTopList_items, g_strdup("/home"), GTK_POS_BOTTOM); - gtk_widget_grab_focus( fsFNameList ); - if (fsLastFNameListSelected + 1 > ((GtkCList *)fsFNameList)->rows) fsLastFNameListSelected = 0; - ((GtkCList *)fsFNameList)->focus_row = fsLastFNameListSelected; - gtk_clist_select_row( GTK_CLIST( fsFNameList ),fsLastFNameListSelected,1 ); - fsLastFNameListSelected = 0; + if (stat("/media", &f) == 0) + fsTopList_items = fs_AddPath(fsTopList_items, g_strdup("/media"), GTK_POS_BOTTOM); - gtk_widget_show( FileSelector ); + if (stat("/mnt", &f) == 0) + fsTopList_items = fs_AddPath(fsTopList_items, g_strdup("/mnt"), GTK_POS_BOTTOM); + + fsTopList_items = fs_AddPath(fsTopList_items, g_strdup("/"), GTK_POS_BOTTOM); + gtk_combo_set_popdown_strings(GTK_COMBO(fsCombo4), fsTopList_items); + + gtk_widget_grab_focus(fsFNameList); + + if (fsLastFNameListSelected + 1 > ((GtkCList *)fsFNameList)->rows) + fsLastFNameListSelected = 0; + + ((GtkCList *)fsFNameList)->focus_row = fsLastFNameListSelected; + gtk_clist_select_row(GTK_CLIST(fsFNameList), fsLastFNameListSelected, 1); + fsLastFNameListSelected = 0; + + gtk_widget_show(FileSelector); }

1 0

r36105 - in trunk/gui: app/cfg-old.c dialog/fileselect.c dialog/playlist.c
by ib 31 Mar '13

31 Mar '13

Author: ib Date: Sun Mar 31 03:20:18 2013 New Revision: 36105 Log: Remove pointless replacement lists. Remove pointless #undefs. Modified: trunk/gui/app/cfg-old.c trunk/gui/dialog/fileselect.c trunk/gui/dialog/playlist.c Modified: trunk/gui/app/cfg-old.c ============================================================================== --- trunk/gui/app/cfg-old.c Sat Mar 30 16:09:51 2013 (r36104) +++ trunk/gui/app/cfg-old.c Sun Mar 31 03:20:18 2013 (r36105) @@ -44,6 +44,3 @@ static const gchar *cfg_old_filename_fro #endif return fname; } - -#undef CFG_OLD_FILESELECT -#undef CFG_OLD_PLAYLIST Modified: trunk/gui/dialog/fileselect.c ============================================================================== --- trunk/gui/dialog/fileselect.c Sat Mar 30 16:09:51 2013 (r36104) +++ trunk/gui/dialog/fileselect.c Sun Mar 31 03:20:18 2013 (r36105) @@ -47,7 +47,7 @@ #include "preferences.h" #include "tools.h" -#define CFG_OLD_FILESELECT 1 +#define CFG_OLD_FILESELECT #include "gui/app/cfg-old.c" #ifndef __linux__ Modified: trunk/gui/dialog/playlist.c ============================================================================== --- trunk/gui/dialog/playlist.c Sat Mar 30 16:09:51 2013 (r36104) +++ trunk/gui/dialog/playlist.c Sun Mar 31 03:20:18 2013 (r36105) @@ -43,7 +43,7 @@ #include "pixmaps/open2.xpm" #include "pixmaps/dir2.xpm" -#define CFG_OLD_PLAYLIST 1 +#define CFG_OLD_PLAYLIST #include "gui/app/cfg-old.c" GtkWidget * Playlist = NULL;

1 0

r36104 - in trunk/gui: dialog/about.c dialog/equalizer.c dialog/fileselect.c dialog/msgbox.c dialog/playlist.c dialog/preferences.c dialog/skinbrowser.c dialog/url.c ui/menu.c
by ib 30 Mar '13

30 Mar '13

Author: ib Date: Sat Mar 30 16:09:51 2013 New Revision: 36104 Log: Silence "warning: unused parameter". Modified: trunk/gui/dialog/about.c trunk/gui/dialog/equalizer.c trunk/gui/dialog/fileselect.c trunk/gui/dialog/msgbox.c trunk/gui/dialog/playlist.c trunk/gui/dialog/preferences.c trunk/gui/dialog/skinbrowser.c trunk/gui/dialog/url.c trunk/gui/ui/menu.c Modified: trunk/gui/dialog/about.c ============================================================================== --- trunk/gui/dialog/about.c Sat Mar 30 15:33:35 2013 (r36103) +++ trunk/gui/dialog/about.c Sat Mar 30 16:09:51 2013 (r36104) @@ -29,7 +29,12 @@ GtkWidget * About = NULL; static void abWidgetDestroy( GtkButton * button, gpointer user_data ) -{ gtk_widget_destroy( About ); } +{ + (void) button; + (void) user_data; + + gtk_widget_destroy( About ); +} static GtkWidget * CreateAbout( void ) { Modified: trunk/gui/dialog/equalizer.c ============================================================================== --- trunk/gui/dialog/equalizer.c Sat Mar 30 15:33:35 2013 (r36103) +++ trunk/gui/dialog/equalizer.c Sat Mar 30 16:09:51 2013 (r36104) @@ -128,6 +128,10 @@ static void eqSetChannelNames( void ) static gboolean eqHScaleMotion( GtkWidget * widget,GdkEventMotion * event,gpointer user_data ) { equalizer_t eq; + + (void) widget; + (void) event; + switch ( (int)user_data ) { case 0: eq.gain=A3125adj->value; break; @@ -156,6 +160,8 @@ static gboolean eqHScaleMotion( GtkWidge static gboolean eqVScaleMotion( GtkWidget * widget,GdkEventMotion * event,gpointer user_data ) { + (void) widget; + (void) event; switch( (int)user_data ) { @@ -170,6 +176,8 @@ static gboolean eqVScaleMotion( GtkWidge static void eqButtonReleased( GtkButton * button,gpointer user_data ) { + (void) button; + switch( (int)user_data ) { case 0: @@ -201,12 +209,21 @@ static void eqButtonReleased( GtkButton static gboolean eqFocus( GtkWidget * widget,GdkEvent * event,gpointer user_data ) { + (void) widget; + (void) event; + (void) user_data; + eqSetBands( Channel ); return FALSE; } static void eqSelectChannelsListRow( GtkCList * clist,gint row,gint column,GdkEvent * event,gpointer user_data ) { + (void) clist; + (void) column; + (void) event; + (void) user_data; + Channel=row - 1; eqSetBands( Channel ); if ( Channel == -1 ) @@ -221,6 +238,10 @@ static void eqSelectChannelsListRow( Gtk static void eqNotebook( GtkNotebook * notebook, gpointer page, guint page_num, gpointer user_data ) { + (void) notebook; + (void) page; + (void) user_data; + if ( page_num ) gtk_widget_hide( Config ); else gtk_widget_show( Config ); } @@ -548,6 +569,8 @@ void ShowEquConfig( void ) static void ecButtonReleased( GtkButton * button,gpointer user_data ) { + (void) button; + if ( (int)user_data ) { // if you pressed Ok nfree( gtkEquChannel1 ); gtkEquChannel1=gstrdup( gtk_entry_get_text( GTK_ENTRY( CEChannel1 ) ) ); Modified: trunk/gui/dialog/fileselect.c ============================================================================== --- trunk/gui/dialog/fileselect.c Sat Mar 30 15:33:35 2013 (r36103) +++ trunk/gui/dialog/fileselect.c Sat Mar 30 16:09:51 2013 (r36104) @@ -300,6 +300,8 @@ static void fs_PersistantHistory( char * static void fs_fsFilterCombo_activate( GtkEntry * entry, gpointer user_data ) { + (void) entry; + fsFilter=gtk_entry_get_text( GTK_ENTRY( user_data ) ); CheckDir( fsFNameList ); } @@ -310,6 +312,8 @@ static void fs_fsFilterCombo_changed( Gt const char * str; int i; + (void) editable; + str=gtk_entry_get_text( GTK_ENTRY(user_data ) ); switch ( fsType ) @@ -350,6 +354,8 @@ static void fs_fsPathCombo_activate( Gtk const unsigned char * str; gchar * dirname; + (void) entry; + str=gtk_entry_get_text( GTK_ENTRY( user_data ) ); dirname=g_hash_table_lookup(fsPathTable, str); if ( chdir( dirname ? (const unsigned char *)dirname : str ) != -1 ) CheckDir( fsFNameList ); @@ -361,6 +367,8 @@ static void fs_fsPathCombo_changed( GtkE const unsigned char * str; gchar * dirname; + (void) editable; + str=gtk_entry_get_text( GTK_ENTRY( user_data ) ); dirname=g_hash_table_lookup(fsPathTable, str); if ( chdir( dirname ? (const unsigned char *)dirname : str ) != -1 ) CheckDir( fsFNameList ); @@ -370,6 +378,9 @@ static void fs_Up_released( GtkButton * { gchar *utf8dir; + (void) button; + (void) user_data; + chdir( ".." ); CheckDir( fsFNameList ); utf8dir = get_current_dir_name_utf8(); @@ -381,6 +392,9 @@ static void fs_Up_released( GtkButton * static void fs_Cancel_released( GtkButton * button,gpointer user_data ) { + (void) button; + (void) user_data; + gtk_widget_destroy( FileSelector ); fsLastFNameListSelected = fsCurrFNameListSelected; } @@ -392,6 +406,9 @@ static void fs_Ok_released( GtkButton * struct stat fs; gchar * selected; + (void) button; + (void) user_data; + if( ( stat( fsSelectedFile,&fs ) == 0 ) && S_ISDIR( fs.st_mode ) ) { gchar *utf8dir; @@ -450,6 +467,9 @@ static void fs_Ok_released( GtkButton * static void fs_fsFNameList_select_row( GtkCList * clist, gint row, gint column, GdkEvent * event, gpointer user_data) { + (void) column; + (void) user_data; + fsCurrFNameListSelected = row; fsSelectedFile = gtk_clist_get_row_data(clist, row); if( event && event->type == GDK_BUTTON_PRESS ) gtk_button_released( GTK_BUTTON( fsOk ) ); @@ -459,6 +479,8 @@ static gboolean on_FileSelect_key_releas GdkEvent * event, gpointer user_data ) { + (void) user_data; + if ( GTK_WIDGET_TYPE( widget ) == GTK_TYPE_BUTTON ) { if (event->key.keyval == GDK_Return) gtk_button_released( GTK_BUTTON( widget ) ); @@ -489,6 +511,8 @@ static gboolean fs_fsFNameList_event( Gt GdkEventButton *bevent; gint row, col; + (void) user_data; + bevent = (GdkEventButton *) event; if ( event->type == GDK_BUTTON_RELEASE && bevent->button == 2 ) Modified: trunk/gui/dialog/msgbox.c ============================================================================== --- trunk/gui/dialog/msgbox.c Sat Mar 30 15:33:35 2013 (r36103) +++ trunk/gui/dialog/msgbox.c Sat Mar 30 16:09:51 2013 (r36104) @@ -33,6 +33,9 @@ GtkWidget * MessageBox = NULL; static void on_Ok_released( GtkButton * button,gpointer user_data ) { + (void) button; + (void) user_data; + gtk_widget_destroy( MessageBox ); } Modified: trunk/gui/dialog/playlist.c ============================================================================== --- trunk/gui/dialog/playlist.c Sat Mar 30 15:33:35 2013 (r36103) +++ trunk/gui/dialog/playlist.c Sat Mar 30 16:09:51 2013 (r36104) @@ -92,6 +92,10 @@ static int compare_func(const void *a, c static void plRowSelect( GtkCList * clist,gint row,gint column,GdkEvent * event,gpointer user_data ) { + (void) clist; + (void) column; + (void) event; + switch ( (int) user_data ) { case 0: CLFileSelected[row]=True; break; @@ -101,6 +105,10 @@ static void plRowSelect( GtkCList * clis static void plUnRowSelect( GtkCList * clist,gint row,gint column,GdkEvent * event,gpointer user_data ) { + (void) clist; + (void) column; + (void) event; + switch ( (int) user_data ) { case 0: CLFileSelected[row]=False; break; @@ -110,6 +118,8 @@ static void plUnRowSelect( GtkCList * cl static void plButtonReleased( GtkButton * button,gpointer user_data ) { + (void) button; + switch ( (int) user_data ) { case 1: // ok @@ -326,6 +336,8 @@ static void plCTree( GtkCTree * ctree,Gt gchar * path; struct stat statbuf; + (void) user_data; + DirNode=gtk_ctree_node_get_row_data( ctree,parent_node ); if ( !DirNode->scaned ) { @@ -399,6 +411,11 @@ static void plCTRow(GtkCList * clist, gi { DirNodeType * DirNode; GtkCTreeNode * node; + + (void) column; + (void) event; + (void) user_data; + node=gtk_ctree_node_nth( GTK_CTREE( clist ),row ); DirNode=gtk_ctree_node_get_row_data( GTK_CTREE( clist ),node ); current_path=DirNode->path; Modified: trunk/gui/dialog/preferences.c ============================================================================== --- trunk/gui/dialog/preferences.c Sat Mar 30 15:33:35 2013 (r36103) +++ trunk/gui/dialog/preferences.c Sat Mar 30 16:09:51 2013 (r36104) @@ -204,6 +204,8 @@ static void prEntry( GtkEditable * edita const char * comment; int i; + (void) editable; + switch( (int)user_data ) { #ifdef CONFIG_FREETYPE @@ -236,6 +238,8 @@ static void prEntry( GtkEditable * edita static void prButton( GtkButton * button, gpointer user_data ) { + (void) button; + switch ( (int)user_data ) { case bOk: @@ -377,6 +381,9 @@ static void prButton( GtkButton * button static gboolean prHScaler( GtkWidget * widget,GdkEvent * event,gpointer user_data ) { + (void) widget; + (void) event; + switch ( (int)user_data ) { case 0: // extra stereo coefficient @@ -423,6 +430,9 @@ static gboolean prHScaler( GtkWidget * w static void prToggled( GtkToggleButton * togglebutton,gpointer user_data ) { int window; + + (void) togglebutton; + switch ( (int)user_data ) { case 0: // extra stereo coefficient @@ -477,6 +487,10 @@ static void prToggled( GtkToggleButton * static void prCListRow( GtkCList * clist,gint row,gint column,GdkEvent * event,gpointer user_data ) { + (void) clist; + (void) column; + (void) event; + switch ( (int)user_data ) { case 0: // audio driver @@ -1499,6 +1513,9 @@ static GtkWidget *BAudioOk; static GtkWidget *BAudioCancel; static void audioButton(GtkButton *button, gpointer user_data) { + + (void) button; + switch( (int)user_data ) { case 1: #ifdef CONFIG_OSS_AUDIO @@ -1720,6 +1737,8 @@ void ShowDXR3Config( void ) static void dxr3Button( GtkButton * button,gpointer user_data ) { + (void) button; + switch ( (int)user_data ) { case 0: // Ok Modified: trunk/gui/dialog/skinbrowser.c ============================================================================== --- trunk/gui/dialog/skinbrowser.c Sat Mar 30 15:33:35 2013 (r36103) +++ trunk/gui/dialog/skinbrowser.c Sat Mar 30 16:09:51 2013 (r36104) @@ -46,6 +46,8 @@ GtkWidget * SkinBrowser = NULL; static void prButton( GtkButton * button,gpointer user_data ) { + (void) button; + if ( sbSelectedSkin ) { switch ( (int)user_data ) @@ -65,6 +67,9 @@ static void prButton( GtkButton * button static void on_SkinList_select_row( GtkCList * clist,gint row,gint column,GdkEvent * event,gpointer user_data ) { + (void) column; + (void) user_data; + gtk_clist_get_text( clist,row,0,&sbSelectedSkin ); if ( strcmp( prev,sbSelectedSkin ) ) { Modified: trunk/gui/dialog/url.c ============================================================================== --- trunk/gui/dialog/url.c Sat Mar 30 15:33:35 2013 (r36103) +++ trunk/gui/dialog/url.c Sat Mar 30 16:09:51 2013 (r36104) @@ -46,6 +46,8 @@ static void on_Button_pressed( GtkButton { urlItem * item; + (void) button; + if ( (int)user_data ) { gchar * str= strdup( gtk_entry_get_text( GTK_ENTRY( URLEntry ) ) ); Modified: trunk/gui/ui/menu.c ============================================================================== --- trunk/gui/ui/menu.c Sat Mar 30 15:33:35 2013 (r36103) +++ trunk/gui/ui/menu.c Sat Mar 30 16:09:51 2013 (r36104) @@ -75,6 +75,10 @@ static void uiMenuMouse( int Button,int { int x,y,i; + (void) Button; + (void) RX; + (void) RY; + menuItem=-1; x=X - guiApp.menuWindow.X; y=Y - guiApp.menuWindow.Y;

1 0

r36103 - in trunk/gui/dialog: tools.c tools.h
by ib 30 Mar '13

30 Mar '13

Author: ib Date: Sat Mar 30 15:33:35 2013 New Revision: 36103 Log: Remove WidgetDestroy(). It's not the best idea to call gtk_widget_destroy() while the object is currently being destroyed. All former usages of WidgetDestroy() have been replaced, so it's obsolete now. Modified: trunk/gui/dialog/tools.c trunk/gui/dialog/tools.h Modified: trunk/gui/dialog/tools.c ============================================================================== --- trunk/gui/dialog/tools.c Sat Mar 30 15:32:07 2013 (r36102) +++ trunk/gui/dialog/tools.c Sat Mar 30 15:33:35 2013 (r36103) @@ -21,14 +21,6 @@ #include "tools.h" -void WidgetDestroy( GtkWidget * widget,GtkWidget ** widget_pointer ) -{ - if ( !widget_pointer ) return; - gtk_widget_hide( *widget_pointer ); - gtk_widget_destroy( *widget_pointer ); - *widget_pointer=NULL; -} - GtkWidget * AddDialogFrame( GtkWidget * parent ) { GtkWidget * frame; Modified: trunk/gui/dialog/tools.h ============================================================================== --- trunk/gui/dialog/tools.h Sat Mar 30 15:32:07 2013 (r36102) +++ trunk/gui/dialog/tools.h Sat Mar 30 15:33:35 2013 (r36103) @@ -36,6 +36,5 @@ GtkWidget * AddHButtonBox( GtkWidget * p GtkWidget * AddHScaler( GtkAdjustment * adj, GtkWidget * parent, int digit ); GtkWidget * AddVScaler( GtkAdjustment * adj, GtkWidget * parent, int digit ); GtkWidget * AddComboBox( GtkWidget * parent ); -void WidgetDestroy( GtkWidget * widget, GtkWidget ** widget_pointer ); #endif /* MPLAYER_GUI_TOOLS_H */

1 0

r36102 - in trunk/gui/dialog: about.c equalizer.c fileselect.c msgbox.c playlist.c preferences.c skinbrowser.c url.c
by ib 30 Mar '13

30 Mar '13

Author: ib Date: Sat Mar 30 15:32:07 2013 New Revision: 36102 Log: Don't use WidgetDestroy(). (It's not the best idea to call gtk_widget_destroy() there while the object is currently being destroyed.) In order to set the widget pointer to NULL, use gtk_widget_destroyed(). Simply destroy the widget to automatically get the pointer set to NULL then. Modified: trunk/gui/dialog/about.c trunk/gui/dialog/equalizer.c trunk/gui/dialog/fileselect.c trunk/gui/dialog/msgbox.c trunk/gui/dialog/playlist.c trunk/gui/dialog/preferences.c trunk/gui/dialog/skinbrowser.c trunk/gui/dialog/url.c Modified: trunk/gui/dialog/about.c ============================================================================== --- trunk/gui/dialog/about.c Sat Mar 30 15:13:23 2013 (r36101) +++ trunk/gui/dialog/about.c Sat Mar 30 15:32:07 2013 (r36102) @@ -29,7 +29,7 @@ GtkWidget * About = NULL; static void abWidgetDestroy( GtkButton * button, gpointer user_data ) -{ WidgetDestroy( NULL,&About ); } +{ gtk_widget_destroy( About ); } static GtkWidget * CreateAbout( void ) { @@ -335,7 +335,7 @@ static GtkWidget * CreateAbout( void ) AddHSeparator( vbox ); Ok=AddButton( MSGTR_Ok,AddHButtonBox( vbox ) ); - gtk_signal_connect( GTK_OBJECT( About ),"destroy",GTK_SIGNAL_FUNC( WidgetDestroy ),&About ); + gtk_signal_connect( GTK_OBJECT( About ),"destroy",GTK_SIGNAL_FUNC( gtk_widget_destroyed ),&About ); gtk_signal_connect_object( GTK_OBJECT( Ok ),"clicked",GTK_SIGNAL_FUNC( abWidgetDestroy ),NULL ); gtk_widget_add_accelerator( Ok,"clicked",accel_group,GDK_Escape,0,GTK_ACCEL_VISIBLE ); Modified: trunk/gui/dialog/equalizer.c ============================================================================== --- trunk/gui/dialog/equalizer.c Sat Mar 30 15:13:23 2013 (r36101) +++ trunk/gui/dialog/equalizer.c Sat Mar 30 15:32:07 2013 (r36102) @@ -174,12 +174,7 @@ static void eqButtonReleased( GtkButton { case 0: gtk_widget_destroy( Equalizer ); - Equalizer=NULL; - if ( EquConfig ) - { - gtk_widget_destroy( EquConfig ); - EquConfig=NULL; - } + if ( EquConfig ) gtk_widget_destroy( EquConfig ); break; case 1: if ( gtk_notebook_get_current_page( GTK_NOTEBOOK( Notebook ) ) == 0 ) @@ -424,7 +419,7 @@ static GtkWidget * CreateEqualizer( void gtk_widget_add_accelerator( Ok,"clicked",accel_group,GDK_Escape,0,GTK_ACCEL_VISIBLE ); gtk_widget_add_accelerator( Ok,"clicked",accel_group,GDK_Return,0,GTK_ACCEL_VISIBLE ); - gtk_signal_connect( GTK_OBJECT( Equalizer ),"destroy",GTK_SIGNAL_FUNC( WidgetDestroy ),&Equalizer ); + gtk_signal_connect( GTK_OBJECT( Equalizer ),"destroy",GTK_SIGNAL_FUNC( gtk_widget_destroyed ),&Equalizer ); gtk_signal_connect( GTK_OBJECT( Equalizer ),"focus_in_event",GTK_SIGNAL_FUNC( eqFocus ),(void *)2 ); gtk_signal_connect( GTK_OBJECT( ChannelsList ),"select_row",GTK_SIGNAL_FUNC( eqSelectChannelsListRow ),NULL ); @@ -564,7 +559,6 @@ static void ecButtonReleased( GtkButton eqSetChannelNames(); } gtk_widget_destroy( EquConfig ); - EquConfig=NULL; } GtkWidget * CreateEquConfig( void ) @@ -677,7 +671,7 @@ GtkWidget * CreateEquConfig( void ) gtk_widget_add_accelerator( ecOk,"clicked",accel_group,GDK_Return,0,GTK_ACCEL_VISIBLE ); gtk_widget_add_accelerator( ecCancel,"clicked",accel_group,GDK_Escape,0,GTK_ACCEL_VISIBLE ); - gtk_signal_connect( GTK_OBJECT( EquConfig ),"destroy",GTK_SIGNAL_FUNC( WidgetDestroy ),&EquConfig ); + gtk_signal_connect( GTK_OBJECT( EquConfig ),"destroy",GTK_SIGNAL_FUNC( gtk_widget_destroyed ),&EquConfig ); gtk_signal_connect( GTK_OBJECT( ecOk ),"clicked",GTK_SIGNAL_FUNC( ecButtonReleased ),(void *)1 ); gtk_signal_connect( GTK_OBJECT( ecCancel ),"clicked",GTK_SIGNAL_FUNC( ecButtonReleased ),(void *)0 ); Modified: trunk/gui/dialog/fileselect.c ============================================================================== --- trunk/gui/dialog/fileselect.c Sat Mar 30 15:13:23 2013 (r36101) +++ trunk/gui/dialog/fileselect.c Sat Mar 30 15:32:07 2013 (r36102) @@ -382,7 +382,6 @@ static void fs_Up_released( GtkButton * static void fs_Cancel_released( GtkButton * button,gpointer user_data ) { gtk_widget_destroy( FileSelector ); - FileSelector=NULL; fsLastFNameListSelected = fsCurrFNameListSelected; } @@ -507,7 +506,7 @@ static gboolean fs_fsFNameList_event( Gt static void fs_Destroy( void ) { - WidgetDestroy( FileSelector, &FileSelector ); + gtk_widget_destroyed( FileSelector, &FileSelector ); g_hash_table_destroy( fsPathTable ); Modified: trunk/gui/dialog/msgbox.c ============================================================================== --- trunk/gui/dialog/msgbox.c Sat Mar 30 15:13:23 2013 (r36101) +++ trunk/gui/dialog/msgbox.c Sat Mar 30 15:32:07 2013 (r36102) @@ -34,7 +34,6 @@ GtkWidget * MessageBox = NULL; static void on_Ok_released( GtkButton * button,gpointer user_data ) { gtk_widget_destroy( MessageBox ); - MessageBox=NULL; } static GtkWidget * CreateMessageBox( void ) @@ -98,7 +97,7 @@ static GtkWidget * CreateMessageBox( voi gtk_widget_add_accelerator( Ok,"clicked",accel_group,GDK_Return,0,GTK_ACCEL_VISIBLE ); gtk_widget_add_accelerator( Ok,"clicked",accel_group,GDK_Escape,0,GTK_ACCEL_VISIBLE ); - gtk_signal_connect( GTK_OBJECT( MessageBox ),"destroy",GTK_SIGNAL_FUNC( WidgetDestroy ),&MessageBox ); + gtk_signal_connect( GTK_OBJECT( MessageBox ),"destroy",GTK_SIGNAL_FUNC( gtk_widget_destroyed ),&MessageBox ); gtk_signal_connect( GTK_OBJECT( Ok ),"clicked",GTK_SIGNAL_FUNC( on_Ok_released ),NULL ); gtk_window_add_accel_group( GTK_WINDOW( MessageBox ),accel_group ); Modified: trunk/gui/dialog/playlist.c ============================================================================== --- trunk/gui/dialog/playlist.c Sat Mar 30 15:13:23 2013 (r36101) +++ trunk/gui/dialog/playlist.c Sat Mar 30 15:32:07 2013 (r36102) @@ -171,7 +171,6 @@ static void plButtonReleased( GtkButton free( old_path ); old_path=strdup( current_path ); gtk_widget_destroy( Playlist ); - Playlist=NULL; break; case 2: // remove { @@ -541,7 +540,7 @@ static GtkWidget * CreatePlaylist( void gtk_widget_add_accelerator( Cancel,"clicked",accel_group,GDK_Escape,0,GTK_ACCEL_VISIBLE ); - gtk_signal_connect( GTK_OBJECT( Playlist ),"destroy",GTK_SIGNAL_FUNC( WidgetDestroy ),&Playlist ); + gtk_signal_connect( GTK_OBJECT( Playlist ),"destroy",GTK_SIGNAL_FUNC( gtk_widget_destroyed ),&Playlist ); gtk_signal_connect( GTK_OBJECT( CLFiles ),"select_row",GTK_SIGNAL_FUNC( plRowSelect ),(void *)0 ); gtk_signal_connect( GTK_OBJECT( CLFiles ),"unselect_row",GTK_SIGNAL_FUNC( plUnRowSelect ),(void *)0 ); Modified: trunk/gui/dialog/preferences.c ============================================================================== --- trunk/gui/dialog/preferences.c Sat Mar 30 15:13:23 2013 (r36101) +++ trunk/gui/dialog/preferences.c Sat Mar 30 15:32:07 2013 (r36102) @@ -341,18 +341,9 @@ static void prButton( GtkButton * button case bCancel: gtk_widget_destroy( Preferences ); - Preferences=NULL; - if ( AudioConfig ) - { - gtk_widget_destroy( AudioConfig ); - AudioConfig=NULL; - } + if ( AudioConfig ) gtk_widget_destroy( AudioConfig ); #ifdef CONFIG_DXR3 - if ( DXR3Config ) - { - gtk_widget_destroy( DXR3Config ); - DXR3Config=NULL; - } + if ( DXR3Config ) gtk_widget_destroy( DXR3Config ); #endif break; case bAConfig: @@ -1036,7 +1027,7 @@ static GtkWidget * CreatePreferences( vo gtk_widget_add_accelerator( BOk,"clicked",accel_group,GDK_Return,0,GTK_ACCEL_VISIBLE ); gtk_widget_add_accelerator( BCancel,"clicked",accel_group,GDK_Escape,0,GTK_ACCEL_VISIBLE ); - gtk_signal_connect( GTK_OBJECT( Preferences ),"destroy",GTK_SIGNAL_FUNC( WidgetDestroy ),&Preferences ); + gtk_signal_connect( GTK_OBJECT( Preferences ),"destroy",GTK_SIGNAL_FUNC( gtk_widget_destroyed ),&Preferences ); gtk_signal_connect( GTK_OBJECT( AConfig ),"clicked",GTK_SIGNAL_FUNC( prButton ),(void*)bAConfig ); gtk_signal_connect( GTK_OBJECT( BOk ),"clicked",GTK_SIGNAL_FUNC( prButton ),(void*)bOk ); @@ -1544,7 +1535,6 @@ static void audioButton(GtkButton *butto #endif case 0: gtk_widget_destroy(AudioConfig); - AudioConfig=NULL; break; } } @@ -1657,7 +1647,7 @@ static GtkWidget *CreateAudioConfig( voi BAudioOk = AddButton(MSGTR_Ok, hbuttonbox); BAudioCancel = AddButton(MSGTR_Cancel, hbuttonbox); - gtk_signal_connect(GTK_OBJECT(AudioConfig), "destroy", GTK_SIGNAL_FUNC(WidgetDestroy), &AudioConfig); + gtk_signal_connect(GTK_OBJECT(AudioConfig), "destroy", GTK_SIGNAL_FUNC(gtk_widget_destroyed), &AudioConfig); gtk_signal_connect(GTK_OBJECT(BAudioOk), "clicked", GTK_SIGNAL_FUNC(audioButton), (void*)1); gtk_signal_connect(GTK_OBJECT(BAudioCancel), "clicked", GTK_SIGNAL_FUNC(audioButton), (void*)0); @@ -1737,7 +1727,6 @@ static void dxr3Button( GtkButton * butt gtkVfLAVC=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( RBVLavc ) ); case 1: // Cancel gtk_widget_destroy( DXR3Config ); - DXR3Config=NULL; break; } } @@ -1805,7 +1794,7 @@ GtkWidget * CreateDXR3Config( void ) gtk_widget_add_accelerator( dxr3BOk,"clicked",accel_group,GDK_Return,0,GTK_ACCEL_VISIBLE ); gtk_widget_add_accelerator( dxr3BCancel,"clicked",accel_group,GDK_Escape,0,GTK_ACCEL_VISIBLE ); - gtk_signal_connect( GTK_OBJECT( DXR3Config ),"destroy",GTK_SIGNAL_FUNC( WidgetDestroy ),&DXR3Config ); + gtk_signal_connect( GTK_OBJECT( DXR3Config ),"destroy",GTK_SIGNAL_FUNC( gtk_widget_destroyed ),&DXR3Config ); gtk_signal_connect( GTK_OBJECT( dxr3BOk ),"clicked",GTK_SIGNAL_FUNC( dxr3Button ),(void *)0 ); gtk_signal_connect( GTK_OBJECT( dxr3BCancel ),"clicked",GTK_SIGNAL_FUNC( dxr3Button ),(void *)1 ); Modified: trunk/gui/dialog/skinbrowser.c ============================================================================== --- trunk/gui/dialog/skinbrowser.c Sat Mar 30 15:13:23 2013 (r36101) +++ trunk/gui/dialog/skinbrowser.c Sat Mar 30 15:32:07 2013 (r36102) @@ -61,7 +61,6 @@ static void prButton( GtkButton * button } } gtk_widget_destroy( SkinBrowser ); - SkinBrowser=NULL; } static void on_SkinList_select_row( GtkCList * clist,gint row,gint column,GdkEvent * event,gpointer user_data ) @@ -79,7 +78,6 @@ static void on_SkinList_select_row( GtkC free( skinName ); skinName=strdup( sbSelectedSkin ); gtk_widget_destroy( SkinBrowser ); - SkinBrowser=NULL; } } @@ -145,7 +143,7 @@ static GtkWidget * CreateSkinBrowser( vo gtk_widget_add_accelerator( Ok,"clicked",accel_group,GDK_Return,0,GTK_ACCEL_VISIBLE ); gtk_widget_add_accelerator( Cancel,"clicked",accel_group,GDK_Escape,0,GTK_ACCEL_VISIBLE ); - gtk_signal_connect( GTK_OBJECT( SkinBrowser ),"destroy",GTK_SIGNAL_FUNC( WidgetDestroy ),&SkinBrowser ); + gtk_signal_connect( GTK_OBJECT( SkinBrowser ),"destroy",GTK_SIGNAL_FUNC( gtk_widget_destroyed ),&SkinBrowser ); gtk_signal_connect( GTK_OBJECT( SkinList ),"select_row",GTK_SIGNAL_FUNC( on_SkinList_select_row ),NULL ); gtk_signal_connect( GTK_OBJECT( Ok ),"clicked",GTK_SIGNAL_FUNC( prButton ),(void *)1 ); gtk_signal_connect( GTK_OBJECT( Cancel ),"clicked",GTK_SIGNAL_FUNC( prButton ),(void *)0 ); Modified: trunk/gui/dialog/url.c ============================================================================== --- trunk/gui/dialog/url.c Sat Mar 30 15:13:23 2013 (r36101) +++ trunk/gui/dialog/url.c Sat Mar 30 15:32:07 2013 (r36102) @@ -72,7 +72,6 @@ static void on_Button_pressed( GtkButton } } gtk_widget_destroy( URLDialog ); - URLDialog = NULL; } static GtkWidget * CreateURLDialog( void ) @@ -126,7 +125,7 @@ static GtkWidget * CreateURLDialog( void gtk_widget_add_accelerator( Ok,"clicked",accel_group,GDK_Return,0,GTK_ACCEL_VISIBLE ); gtk_widget_add_accelerator( Cancel,"clicked",accel_group,GDK_Escape,0,GTK_ACCEL_VISIBLE ); - gtk_signal_connect( GTK_OBJECT( URLDialog ),"destroy",GTK_SIGNAL_FUNC( WidgetDestroy ),&URLDialog ); + gtk_signal_connect( GTK_OBJECT( URLDialog ),"destroy",GTK_SIGNAL_FUNC( gtk_widget_destroyed ),&URLDialog ); gtk_signal_connect( GTK_OBJECT( Ok ),"clicked",GTK_SIGNAL_FUNC( on_Button_pressed ),(void *)1 ); gtk_signal_connect( GTK_OBJECT( Cancel ),"clicked",GTK_SIGNAL_FUNC( on_Button_pressed ),NULL );

1 0

r36101 - trunk/gui/dialog/msgbox.c
by ib 30 Mar '13

30 Mar '13

Author: ib Date: Sat Mar 30 15:13:23 2013 New Revision: 36101 Log: There is no need to hide the widget prior to destruction. Modified: trunk/gui/dialog/msgbox.c Modified: trunk/gui/dialog/msgbox.c ============================================================================== --- trunk/gui/dialog/msgbox.c Sat Mar 30 09:53:02 2013 (r36100) +++ trunk/gui/dialog/msgbox.c Sat Mar 30 15:13:23 2013 (r36101) @@ -33,7 +33,6 @@ GtkWidget * MessageBox = NULL; static void on_Ok_released( GtkButton * button,gpointer user_data ) { - gtk_widget_hide( MessageBox ); gtk_widget_destroy( MessageBox ); MessageBox=NULL; } @@ -109,7 +108,7 @@ static GtkWidget * CreateMessageBox( voi void ShowMessageBox( const char * msg ) { - if ( MessageBox ) { gtk_widget_hide( MessageBox ); gtk_widget_destroy( MessageBox ); } + if ( MessageBox ) gtk_widget_destroy( MessageBox ); MessageBox=CreateMessageBox(); if ( strlen( msg ) < 20 ) gtk_widget_set_usize( MessageBox,196,-1 ); }

1 0

r36100 - trunk/libao2/ao_coreaudio.c
by reimar 30 Mar '13

30 Mar '13

Author: reimar Date: Sat Mar 30 09:53:02 2013 New Revision: 36100 Log: Avoid declaring loop variables inside the for() This improves compiler compatibility. Modified: trunk/libao2/ao_coreaudio.c Modified: trunk/libao2/ao_coreaudio.c ============================================================================== --- trunk/libao2/ao_coreaudio.c Sat Mar 30 09:42:57 2013 (r36099) +++ trunk/libao2/ao_coreaudio.c Sat Mar 30 09:53:02 2013 (r36100) @@ -369,6 +369,7 @@ static void print_help(void) OSStatus err; UInt32 i_param_size; int num_devices; + int i; AudioDeviceID *devids; char *device_name; @@ -393,7 +394,7 @@ static void print_help(void) num_devices = i_param_size / sizeof(AudioDeviceID); - for (int i = 0; i < num_devices; ++i) { + for (i = 0; i < num_devices; ++i) { err = GetAudioPropertyString(devids[i], kAudioObjectPropertyName, &device_name); if (err == noErr) { @@ -1247,7 +1248,8 @@ static OSStatus StreamListener( AudioObj const AudioObjectPropertyAddress inAddresses[], void *inClientData ) { - for (int i=0; i < inNumberAddresses; ++i) + int i; + for (i=0; i < inNumberAddresses; ++i) { if (inAddresses[i].mSelector == kAudioStreamPropertyPhysicalFormat) { ao_msg(MSGT_AO, MSGL_WARN, "got notify kAudioStreamPropertyPhysicalFormat changed.\n"); @@ -1264,7 +1266,8 @@ static OSStatus DeviceListener( AudioObj const AudioObjectPropertyAddress inAddresses[], void *inClientData ) { - for (int i=0; i < inNumberAddresses; ++i) + int i; + for (i=0; i < inNumberAddresses; ++i) { if (inAddresses[i].mSelector == kAudioDevicePropertyDeviceHasChanged) { ao_msg(MSGT_AO, MSGL_WARN, "got notify kAudioDevicePropertyDeviceHasChanged.\n");

1 0