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

r38542 - trunk/gui/dialog/about.c
by ib 18 May '24

18 May '24

Author: ib Date: Sat May 18 21:24:58 2024 New Revision: 38542 Log: Adjust indentation and style. Modified: trunk/gui/dialog/about.c Modified: trunk/gui/dialog/about.c ============================================================================== --- trunk/gui/dialog/about.c Sat May 18 21:24:26 2024 (r38541) +++ trunk/gui/dialog/about.c Sat May 18 21:24:58 2024 (r38542) @@ -345,7 +345,7 @@ static GtkWidget * CreateAbout( void ) void ShowAbout( void ) { - if ( About ) gtkRaise( About ); + if (About) gtkRaise(About); else { About = CreateAbout();

1 0

r38541 - trunk/gui/dialog/about.c
by ib 18 May '24

18 May '24

Author: ib Date: Sat May 18 21:24:26 2024 New Revision: 38541 Log: Do not call gtk_widget_show() if the About dialog already exists. This is only necessary after creating it. Modified: trunk/gui/dialog/about.c Modified: trunk/gui/dialog/about.c ============================================================================== --- trunk/gui/dialog/about.c Fri May 17 21:12:01 2024 (r38540) +++ trunk/gui/dialog/about.c Sat May 18 21:24:26 2024 (r38541) @@ -346,6 +346,9 @@ static GtkWidget * CreateAbout( void ) void ShowAbout( void ) { if ( About ) gtkRaise( About ); - else About=CreateAbout(); - gtk_widget_show( About ); + else + { + About = CreateAbout(); + gtk_widget_show(About); + } }

1 0

r38540 - trunk/gui/dialog/preferences.c
by ib 17 May '24

17 May '24

Author: ib Date: Fri May 17 21:12:01 2024 New Revision: 38540 Log: Replace all uses of a GList in the preferences with a GSList. The use of a GSList is sufficient, the additional GList features are not required. Also, don't unnecessarily cast strings to gpointer. Modified: trunk/gui/dialog/preferences.c Modified: trunk/gui/dialog/preferences.c ============================================================================== --- trunk/gui/dialog/preferences.c Fri May 17 21:08:51 2024 (r38539) +++ trunk/gui/dialog/preferences.c Fri May 17 21:12:01 2024 (r38540) @@ -605,15 +605,15 @@ static GtkWidget * CreatePreferences( vo #ifdef CONFIG_FREETYPE GtkWidget * vbox11; GSList * Font_group = NULL; - GList * CBFontEncoding_items = NULL; + GSList * CBFontEncoding_items = NULL; #else GtkWidget * hbox7; #endif #ifdef CONFIG_ICONV iconv_t cd; - GList * CBSubEncoding_items = NULL; + GSList * CBSubEncoding_items = NULL; #endif - GList *list; + GSList *list; GtkWidget * vbox7; GtkWidget * vbox8; GtkWidget * table1; @@ -849,7 +849,7 @@ static GtkWidget * CreatePreferences( vo #ifdef CONFIG_ICONV gtk_misc_set_alignment( GTK_MISC( label ),0,0 ); CBSubEncoding=gtkAddCombo(vbox10); - CBSubEncoding_items=g_list_append( CBSubEncoding_items,_(MSGTR_GUI__Default_) ); + CBSubEncoding_items = g_slist_append(CBSubEncoding_items, _(MSGTR_GUI__Default_)); { int i, listed=(sub_cp == NULL); @@ -860,13 +860,13 @@ static GtkWidget * CreatePreferences( vo if (cd != (iconv_t) -1) { iconv_close(cd); - CBSubEncoding_items=g_list_append( CBSubEncoding_items,_(lEncoding[i].comment) ); + CBSubEncoding_items = g_slist_append(CBSubEncoding_items, _(lEncoding[i].comment)); if ( !listed ) if ( av_strcasecmp ( lEncoding[i].name, sub_cp ) == 0 ) listed=True; } } - if ( !listed ) CBSubEncoding_items=g_list_insert( CBSubEncoding_items,sub_cp,1 ); + if (!listed) CBSubEncoding_items = g_slist_insert(CBSubEncoding_items, sub_cp, 1); } list = CBSubEncoding_items; @@ -877,7 +877,7 @@ static GtkWidget * CreatePreferences( vo list = list->next; } - g_list_free( CBSubEncoding_items ); + g_slist_free(CBSubEncoding_items); gtkEntrySetEditable(CBSubEncoding, FALSE); #endif @@ -969,13 +969,13 @@ static GtkWidget * CreatePreferences( vo #endif if ( append ) { - CBFontEncoding_items=g_list_append( CBFontEncoding_items,_(lEncoding[i].comment) ); + CBFontEncoding_items = g_slist_append(CBFontEncoding_items, _(lEncoding[i].comment)); if ( !listed ) if ( av_strcasecmp ( lEncoding[i].name, subtitle_font_encoding ) == 0 ) listed=True; } } - if ( !listed ) CBFontEncoding_items=g_list_insert( CBFontEncoding_items,subtitle_font_encoding,1 ); + if (!listed) CBFontEncoding_items = g_slist_insert(CBFontEncoding_items, subtitle_font_encoding, 1); } list = CBFontEncoding_items; @@ -986,7 +986,7 @@ static GtkWidget * CreatePreferences( vo list = list->next; } - g_list_free( CBFontEncoding_items ); + g_slist_free(CBFontEncoding_items); gtkEntrySetEditable(CBFontEncoding, FALSE); @@ -1212,7 +1212,7 @@ static GtkWidget * CreatePreferences( vo void ShowPreferences( void ) { - GList *list; + GSList *list; if ( Preferences ) gtkRaise( Preferences ); else Preferences=CreatePreferences(); @@ -1391,15 +1391,15 @@ void ShowPreferences( void ) if ( index_mode == 1 ) gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBIndex ),1 ); { int i; - GList * Items = NULL; + GSList * Items = NULL; const char *name; - Items=g_list_append( Items,_(MSGTR_GUI__Default_) ); + Items = g_slist_append(Items, _(MSGTR_GUI__Default_)); name = Items->data; for( i=0;mpcodecs_vd_drivers[i];i++ ) { - Items=g_list_append( Items,(char *)mpcodecs_vd_drivers[i]->info->name ); + Items = g_slist_append(Items, (char *) mpcodecs_vd_drivers[i]->info->name); if ( video_fm_list && !gstrcmp( video_fm_list[0],mpcodecs_vd_drivers[i]->info->short_name ) ) name=mpcodecs_vd_drivers[i]->info->name; } @@ -1413,20 +1413,20 @@ void ShowPreferences( void ) gtk_entry_set_text(gtkEntry(CBVideoFamily), name); - g_list_free( Items ); + g_slist_free(Items); } { int i; - GList * Items = NULL; + GSList * Items = NULL; const char *name; - Items=g_list_append( Items,_(MSGTR_GUI__Default_) ); + Items = g_slist_append(Items, _(MSGTR_GUI__Default_)); name = Items->data; for( i=0;mpcodecs_ad_drivers[i];i++ ) { - Items=g_list_append( Items,(char *)mpcodecs_ad_drivers[i]->info->name ); + Items = g_slist_append(Items, (char *) mpcodecs_ad_drivers[i]->info->name); if ( audio_fm_list && !gstrcmp( audio_fm_list[0],mpcodecs_ad_drivers[i]->info->short_name ) ) name=mpcodecs_ad_drivers[i]->info->name; } @@ -1440,7 +1440,7 @@ void ShowPreferences( void ) gtk_entry_set_text(gtkEntry(CBAudioFamily), name); - g_list_free( Items ); + g_slist_free(Items); } /* 6th page */ @@ -1532,106 +1532,106 @@ void ShowPreferences( void ) } #ifdef CONFIG_OSS_AUDIO -static GList *appendOSSDevices(GList *l) +static GSList *appendOSSDevices (GSList *l) { /* careful! the current implementation allows only string constants! */ - l = g_list_append(l, (gpointer)"/dev/dsp"); + l = g_slist_append(l, "/dev/dsp"); if (gtkAOOSSDevice && strncmp(gtkAOOSSDevice, "/dev/sound", 10) == 0) { - l = g_list_append(l, (gpointer)"/dev/sound/dsp0"); - l = g_list_append(l, (gpointer)"/dev/sound/dsp1"); - l = g_list_append(l, (gpointer)"/dev/sound/dsp2"); - l = g_list_append(l, (gpointer)"/dev/sound/dsp3"); + l = g_slist_append(l, "/dev/sound/dsp0"); + l = g_slist_append(l, "/dev/sound/dsp1"); + l = g_slist_append(l, "/dev/sound/dsp2"); + l = g_slist_append(l, "/dev/sound/dsp3"); } else { - l = g_list_append(l, (gpointer)"/dev/dsp0"); - l = g_list_append(l, (gpointer)"/dev/dsp1"); - l = g_list_append(l, (gpointer)"/dev/dsp2"); - l = g_list_append(l, (gpointer)"/dev/dsp3"); + l = g_slist_append(l, "/dev/dsp0"); + l = g_slist_append(l, "/dev/dsp1"); + l = g_slist_append(l, "/dev/dsp2"); + l = g_slist_append(l, "/dev/dsp3"); } #ifdef CONFIG_DXR3 - l = g_list_append(l, (gpointer)"/dev/em8300_ma"); - l = g_list_append(l, (gpointer)"/dev/em8300_ma-0"); - l = g_list_append(l, (gpointer)"/dev/em8300_ma-1"); - l = g_list_append(l, (gpointer)"/dev/em8300_ma-2"); - l = g_list_append(l, (gpointer)"/dev/em8300_ma-3"); + l = g_slist_append(l, "/dev/em8300_ma"); + l = g_slist_append(l, "/dev/em8300_ma-0"); + l = g_slist_append(l, "/dev/em8300_ma-1"); + l = g_slist_append(l, "/dev/em8300_ma-2"); + l = g_slist_append(l, "/dev/em8300_ma-3"); #endif return l; } -static GList *appendOSSMixers(GList *l) +static GSList *appendOSSMixers (GSList *l) { /* careful! the current implementation allows only string constants! */ - l = g_list_append(l, (gpointer)"/dev/mixer"); + l = g_slist_append(l, "/dev/mixer"); if (gtkAOOSSMixer && strncmp(gtkAOOSSMixer, "/dev/sound", 10) == 0) { - l = g_list_append(l, (gpointer)"/dev/sound/mixer0"); - l = g_list_append(l, (gpointer)"/dev/sound/mixer1"); - l = g_list_append(l, (gpointer)"/dev/sound/mixer2"); - l = g_list_append(l, (gpointer)"/dev/sound/mixer3"); + l = g_slist_append(l, "/dev/sound/mixer0"); + l = g_slist_append(l, "/dev/sound/mixer1"); + l = g_slist_append(l, "/dev/sound/mixer2"); + l = g_slist_append(l, "/dev/sound/mixer3"); } else { - l = g_list_append(l, (gpointer)"/dev/mixer0"); - l = g_list_append(l, (gpointer)"/dev/mixer1"); - l = g_list_append(l, (gpointer)"/dev/mixer2"); - l = g_list_append(l, (gpointer)"/dev/mixer3"); + l = g_slist_append(l, "/dev/mixer0"); + l = g_slist_append(l, "/dev/mixer1"); + l = g_slist_append(l, "/dev/mixer2"); + l = g_slist_append(l, "/dev/mixer3"); } return l; } -static GList *appendOSSMixerChannels(GList *l) +static GSList *appendOSSMixerChannels (GSList *l) { - l = g_list_append(l, (gpointer)"vol"); - l = g_list_append(l, (gpointer)"pcm"); - l = g_list_append(l, (gpointer)"line"); + l = g_slist_append(l, "vol"); + l = g_slist_append(l, "pcm"); + l = g_slist_append(l, "line"); return l; } #endif #ifdef CONFIG_ALSA -static GList *appendALSADevices(GList *l) +static GSList *appendALSADevices (GSList *l) { - l = g_list_append(l, (gpointer)"default"); - l = g_list_append(l, (gpointer)"hw=0.0"); - l = g_list_append(l, (gpointer)"hw=0.1"); - l = g_list_append(l, (gpointer)"hw=0.2"); - l = g_list_append(l, (gpointer)"surround40"); - l = g_list_append(l, (gpointer)"surround51"); - l = g_list_append(l, (gpointer)"plug=surround40"); - l = g_list_append(l, (gpointer)"plug=surround51"); + l = g_slist_append(l, "default"); + l = g_slist_append(l, "hw=0.0"); + l = g_slist_append(l, "hw=0.1"); + l = g_slist_append(l, "hw=0.2"); + l = g_slist_append(l, "surround40"); + l = g_slist_append(l, "surround51"); + l = g_slist_append(l, "plug=surround40"); + l = g_slist_append(l, "plug=surround51"); return l; } -static GList *appendALSAMixers(GList *l) +static GSList *appendALSAMixers (GSList *l) { - l = g_list_append(l, (gpointer)"default"); + l = g_slist_append(l, "default"); return l; } -static GList *appendALSAMixerChannels(GList *l) +static GSList *appendALSAMixerChannels (GSList *l) { - l = g_list_append(l, (gpointer)"Master"); - l = g_list_append(l, (gpointer)"Line"); - l = g_list_append(l, (gpointer)"PCM"); - l = g_list_append(l, (gpointer)"PCM,1"); + l = g_slist_append(l, "Master"); + l = g_slist_append(l, "Line"); + l = g_slist_append(l, "PCM"); + l = g_slist_append(l, "PCM,1"); return l; } #endif #ifdef CONFIG_SDL -static GList *appendSDLDevices(GList *l) +static GSList *appendSDLDevices (GSList *l) { - l = g_list_append(l, (gpointer)"alsa"); - l = g_list_append(l, (gpointer)"arts"); - l = g_list_append(l, (gpointer)"esd"); - l = g_list_append(l, (gpointer)"jack"); - l = g_list_append(l, (gpointer)"oss"); - l = g_list_append(l, (gpointer)"nas"); + l = g_slist_append(l, "alsa"); + l = g_slist_append(l, "arts"); + l = g_slist_append(l, "esd"); + l = g_slist_append(l, "jack"); + l = g_slist_append(l, "oss"); + l = g_slist_append(l, "nas"); return l; } #endif #ifdef CONFIG_ESD -static GList *appendESDDevices(GList *l) +static GSList *appendESDDevices (GSList *l) { - l = g_list_append(l, (gpointer)"Enter Remote IP"); - l = g_list_append(l, (gpointer)"Use Software Mixer"); + l = g_slist_append(l, "Enter Remote IP"); + l = g_slist_append(l, "Use Software Mixer"); return l; } #endif @@ -1712,7 +1712,7 @@ static void audioButton(GtkButton *butto } static GtkWidget *CreateAudioConfig( void ) { - GList *items = NULL, *list; + GSList *items = NULL, *list; GtkWidget *vbox; GtkWidget *table; GtkWidget *label; @@ -1739,7 +1739,7 @@ static GtkWidget *CreateAudioConfig( voi CBAudioDevice = gtkAddCombo(NULL); gtk_table_attach(GTK_TABLE(table), CBAudioDevice, 1, 2, 0, 1, (GtkAttachOptions)(GTK_EXPAND | GTK_FILL), (GtkAttachOptions)(0), 0, 0); - items = g_list_append(items,(gpointer)_(MSGTR_GUI_DefaultSetting)); + items = g_slist_append(items, _(MSGTR_GUI_DefaultSetting)); #ifdef CONFIG_OSS_AUDIO if (strncmp(ao_driver[0], "oss", 3) == 0) items = appendOSSDevices(items); @@ -1765,7 +1765,7 @@ static GtkWidget *CreateAudioConfig( voi list = list->next; } - g_list_free(items); + g_slist_free(items); items = NULL; label = gtkAddLabelColon(_(MSGTR_GUI_Mixer), NULL); @@ -1773,7 +1773,7 @@ static GtkWidget *CreateAudioConfig( voi CBAudioMixer = gtkAddCombo(NULL); gtk_table_attach(GTK_TABLE(table), CBAudioMixer, 1, 2, 1, 2, (GtkAttachOptions)(GTK_EXPAND | GTK_FILL), (GtkAttachOptions)(0), 0, 0); - items = g_list_append(items, (gpointer)_(MSGTR_GUI_DefaultSetting)); + items = g_slist_append(items, _(MSGTR_GUI_DefaultSetting)); #ifdef CONFIG_OSS_AUDIO if (strncmp(ao_driver[0], "oss", 3) == 0) items = appendOSSMixers(items); @@ -1791,7 +1791,7 @@ static GtkWidget *CreateAudioConfig( voi list = list->next; } - g_list_free(items); + g_slist_free(items); items = NULL; label = gtkAddLabelColon(_(MSGTR_GUI_MixerChannel), NULL); @@ -1799,7 +1799,7 @@ static GtkWidget *CreateAudioConfig( voi CBAudioMixerChannel = gtkAddCombo(NULL); gtk_table_attach(GTK_TABLE(table), CBAudioMixerChannel, 1, 2, 2, 3, (GtkAttachOptions)(GTK_EXPAND | GTK_FILL), (GtkAttachOptions)(0), 0, 0); - items = g_list_append(items, (gpointer)_(MSGTR_GUI_DefaultSetting)); + items = g_slist_append(items, _(MSGTR_GUI_DefaultSetting)); #ifdef CONFIG_OSS_AUDIO if (strncmp(ao_driver[0], "oss", 3) == 0) items = appendOSSMixerChannels(items); @@ -1817,7 +1817,7 @@ static GtkWidget *CreateAudioConfig( voi list = list->next; } - g_list_free(items); + g_slist_free(items); gtkAddHSeparator(vbox);

1 0

r38539 - trunk/gui/dialog/equalizer.c
by ib 17 May '24

17 May '24

Author: ib Date: Fri May 17 21:08:51 2024 New Revision: 38539 Log: Replace the GList of equalizer channels with a GSList. A GSList is sufficient, the additional GList features are not required. Modified: trunk/gui/dialog/equalizer.c Modified: trunk/gui/dialog/equalizer.c ============================================================================== --- trunk/gui/dialog/equalizer.c Fri May 17 21:07:42 2024 (r38538) +++ trunk/gui/dialog/equalizer.c Fri May 17 21:08:51 2024 (r38539) @@ -524,17 +524,17 @@ GtkWidget * CreateEquConfig( void ); void ShowEquConfig( void ) { - GList * Items = NULL, *list; + GSList *Items = NULL, *list; if ( EquConfig ) gtkRaise( EquConfig ); else EquConfig=CreateEquConfig(); - Items=g_list_append( Items,(gpointer)_(MSGTR_GUI_FrontRight) ); - Items=g_list_append( Items,(gpointer)_(MSGTR_GUI_FrontLeft) ); - Items=g_list_append( Items,(gpointer)_(MSGTR_GUI_RearRight) ); - Items=g_list_append( Items,(gpointer)_(MSGTR_GUI_RearLeft) ); - Items=g_list_append( Items,(gpointer)_(MSGTR_GUI_Center) ); - Items=g_list_append( Items,(gpointer)_(MSGTR_GUI_Bass) ); + Items = g_slist_append(Items, _(MSGTR_GUI_FrontRight)); + Items = g_slist_append(Items, _(MSGTR_GUI_FrontLeft)); + Items = g_slist_append(Items, _(MSGTR_GUI_RearRight)); + Items = g_slist_append(Items, _(MSGTR_GUI_RearLeft)); + Items = g_slist_append(Items, _(MSGTR_GUI_Center)); + Items = g_slist_append(Items, _(MSGTR_GUI_Bass)); list = Items; @@ -550,7 +550,7 @@ void ShowEquConfig( void ) list = list->next; } - g_list_free( Items ); + g_slist_free(Items); gtk_entry_set_text(gtkEntry(CBChannel1), gtkEquChannel1); gtkEntrySetEditable(CBChannel1, FALSE); gtk_entry_set_text(gtkEntry(CBChannel2), gtkEquChannel2); gtkEntrySetEditable(CBChannel2, FALSE);

1 0

r38538 - trunk/gui/dialog/fileselect.c
by ib 17 May '24

17 May '24

Author: ib Date: Fri May 17 21:07:42 2024 New Revision: 38538 Log: Replace the GList of file selector paths with a GSList. A GSList is sufficient, the additional GList features are not required. Modified: trunk/gui/dialog/fileselect.c Modified: trunk/gui/dialog/fileselect.c ============================================================================== --- trunk/gui/dialog/fileselect.c Fri May 17 20:46:16 2024 (r38537) +++ trunk/gui/dialog/fileselect.c Fri May 17 21:07:42 2024 (r38538) @@ -160,7 +160,7 @@ GtkWidget *fsOk; GtkWidget *fsUp; GtkWidget *fsCancel; GtkWidget *fsPathCombo; -GList *fsPathList; +GSList *fsPathList; GHashTable *fsPathTable; GtkWidget *fsFilterCombo; @@ -205,13 +205,13 @@ static gchar *get_current_dir_name_utf8( return utf8dir; } -static GList *fs_AddPath(GList *list, gpointer data, GtkPositionType pos) +static GSList *fs_AddPath(GSList *list, gpointer data, GtkPositionType pos) { - if (!g_list_find_custom(list, data, (GCompareFunc)strcmp)) { + if (!g_slist_find_custom(list, data, (GCompareFunc)strcmp)) { if (pos == GTK_POS_TOP) - list = g_list_prepend(list, data); + list = g_slist_prepend(list, data); else - list = g_list_append(list, data); + list = g_slist_append(list, data); } return list; @@ -734,9 +734,9 @@ static void fs_Destroy(void) g_hash_table_destroy(fsPathTable); WARN_OFF(cast_function_type) - g_list_foreach(fsPathList, (GFunc)g_free, NULL); // deliberate cast between incompatible function types + g_slist_foreach(fsPathList, (GFunc)g_free, NULL); // deliberate cast between incompatible function types WARN_ON - g_list_free(fsPathList); + g_slist_free(fsPathList); fsPathList = NULL; } @@ -850,7 +850,7 @@ void ShowFileSelector(int type) char *tmp = NULL, *dir = NULL; const gchar *fname; struct stat f; - GList *list; + GSList *list; if (FileSelector) gtkRaise(FileSelector);

1 0

r38537 - trunk/gui/dialog/preferences.c
by ib 17 May '24

17 May '24

Author: ib Date: Fri May 17 20:46:16 2024 New Revision: 38537 Log: Rename some variables. Rename CBVFM and CBAFM to less cryptic CBVideoFamily and CBAudioFamily. Modified: trunk/gui/dialog/preferences.c Modified: trunk/gui/dialog/preferences.c ============================================================================== --- trunk/gui/dialog/preferences.c Fri May 17 20:45:18 2024 (r38536) +++ trunk/gui/dialog/preferences.c Fri May 17 20:46:16 2024 (r38537) @@ -80,8 +80,8 @@ static GtkWidget * CLVDrivers; GtkWidget * prEDVDDevice; GtkWidget * prECDRomDevice; -static GtkWidget * CBVFM; -static GtkWidget * CBAFM; +static GtkWidget * CBVideoFamily; +static GtkWidget * CBAudioFamily; static GtkWidget * CBAudioEqualizer; //static GtkWidget * CBSurround; static GtkWidget * CBExtraStereo; @@ -367,7 +367,7 @@ static void prButton( GtkButton * button { int i; - const char *tmp = gtk_entry_get_text(gtkEntry(CBVFM)); + const char *tmp = gtk_entry_get_text(gtkEntry(CBVideoFamily)); for( i=0;mpcodecs_vd_drivers[i];i++ ) if ( !gstrcmp( tmp,mpcodecs_vd_drivers[i]->info->name ) ) { listSet( &video_fm_list,mpcodecs_vd_drivers[i]->info->short_name ); break; } @@ -375,7 +375,7 @@ static void prButton( GtkButton * button { int i; - const char *tmp = gtk_entry_get_text(gtkEntry(CBAFM)); + const char *tmp = gtk_entry_get_text(gtkEntry(CBAudioFamily)); for( i=0;mpcodecs_ad_drivers[i];i++ ) if ( !gstrcmp( tmp,mpcodecs_ad_drivers[i]->info->name ) ) { listSet( &audio_fm_list,mpcodecs_ad_drivers[i]->info->short_name ); break; } @@ -1046,17 +1046,17 @@ static GtkWidget * CreatePreferences( vo gtkAddLabelColon( _(MSGTR_GUI_CodecFamilyVideo),hbox5 ); - CBVFM=gtkAddCombo(hbox5); + CBVideoFamily = gtkAddCombo(hbox5); - gtkEntrySetEditable(CBVFM, FALSE); + gtkEntrySetEditable(CBVideoFamily, FALSE); hbox5=gtkAddHBox( vbox604,1 ); gtkAddLabelColon( _(MSGTR_GUI_CodecFamilyAudio),hbox5 ); - CBAFM=gtkAddCombo(hbox5); + CBAudioFamily = gtkAddCombo(hbox5); - gtkEntrySetEditable(CBAFM, FALSE); + gtkEntrySetEditable(CBAudioFamily, FALSE); label=gtkAddLabel( _(MSGTR_GUI_Demuxers_Codecs),NULL ); gtk_notebook_set_tab_label( GTK_NOTEBOOK( notebook1 ),gtk_notebook_get_nth_page( GTK_NOTEBOOK( notebook1 ),4 ),label ); @@ -1407,11 +1407,11 @@ void ShowPreferences( void ) while (list) { - gtk_combo_box_append_text(GTK_COMBO_BOX(CBVFM), list->data); + gtk_combo_box_append_text(GTK_COMBO_BOX(CBVideoFamily), list->data); list = list->next; } - gtk_entry_set_text(gtkEntry(CBVFM), name); + gtk_entry_set_text(gtkEntry(CBVideoFamily), name); g_list_free( Items ); } @@ -1434,11 +1434,11 @@ void ShowPreferences( void ) while (list) { - gtk_combo_box_append_text(GTK_COMBO_BOX(CBAFM), list->data); + gtk_combo_box_append_text(GTK_COMBO_BOX(CBAudioFamily), list->data); list = list->next; } - gtk_entry_set_text(gtkEntry(CBAFM), name); + gtk_entry_set_text(gtkEntry(CBAudioFamily), name); g_list_free( Items ); }

1 0

r38536 - in trunk/gui/dialog: dialog.c preferences.c
by ib 17 May '24

17 May '24

Author: ib Date: Fri May 17 20:45:18 2024 New Revision: 38536 Log: Call gtkSetLayer() for Preferences in gtkShow(). Remove it from ShowPreferences(). For all other dialogs, gtkSetLayer() is also called in gtkShow(). Modified: trunk/gui/dialog/dialog.c trunk/gui/dialog/preferences.c Modified: trunk/gui/dialog/dialog.c ============================================================================== --- trunk/gui/dialog/dialog.c Fri May 17 20:43:36 2024 (r38535) +++ trunk/gui/dialog/dialog.c Fri May 17 20:45:18 2024 (r38536) @@ -291,6 +291,7 @@ void gtkShow(int type, char *param) case evPreferences: ShowPreferences(); + gtkSetLayer(Preferences); break; case evPlaylist: Modified: trunk/gui/dialog/preferences.c ============================================================================== --- trunk/gui/dialog/preferences.c Fri May 17 20:43:36 2024 (r38535) +++ trunk/gui/dialog/preferences.c Fri May 17 20:45:18 2024 (r38536) @@ -1529,7 +1529,6 @@ void ShowPreferences( void ) g_signal_connect( G_OBJECT( CLVDrivers ),"select-row",G_CALLBACK( prCListRow ),GINT_TO_POINTER(1) ); gtk_widget_show( Preferences ); - gtkSetLayer( Preferences ); } #ifdef CONFIG_OSS_AUDIO

1 0

r38535 - trunk/gui/dialog/fileselect.c
by ib 17 May '24

17 May '24

Author: ib Date: Fri May 17 20:43:36 2024 New Revision: 38535 Log: Adjust spacing. Modified: trunk/gui/dialog/fileselect.c Modified: trunk/gui/dialog/fileselect.c ============================================================================== --- trunk/gui/dialog/fileselect.c Fri May 17 20:42:57 2024 (r38534) +++ trunk/gui/dialog/fileselect.c Fri May 17 20:43:36 2024 (r38535) @@ -221,7 +221,7 @@ static void fs_AddPathUtf8(const char *n { gchar *utf8name; - utf8name = g_filename_display_name(name); + utf8name = g_filename_display_name(name); fsPathList = fs_AddPath(fsPathList, utf8name, pos); g_hash_table_insert(fsPathTable, strdup(utf8name), strdup(name)); }

1 0

r38534 - trunk/gui/dialog/fileselect.c
by ib 17 May '24

17 May '24

Author: ib Date: Fri May 17 20:42:57 2024 New Revision: 38534 Log: Rename a variable. Choose a simpler name that is more descriptive. Modified: trunk/gui/dialog/fileselect.c Modified: trunk/gui/dialog/fileselect.c ============================================================================== --- trunk/gui/dialog/fileselect.c Fri May 17 20:41:33 2024 (r38533) +++ trunk/gui/dialog/fileselect.c Fri May 17 20:42:57 2024 (r38534) @@ -160,7 +160,7 @@ GtkWidget *fsOk; GtkWidget *fsUp; GtkWidget *fsCancel; GtkWidget *fsPathCombo; -GList *fsTopList_items; +GList *fsPathList; GHashTable *fsPathTable; GtkWidget *fsFilterCombo; @@ -222,7 +222,7 @@ static void fs_AddPathUtf8(const char *n gchar *utf8name; utf8name = g_filename_display_name(name); - fsTopList_items = fs_AddPath(fsTopList_items, utf8name, pos); + fsPathList = fs_AddPath(fsPathList, utf8name, pos); g_hash_table_insert(fsPathTable, strdup(utf8name), strdup(name)); } @@ -734,10 +734,10 @@ static void fs_Destroy(void) g_hash_table_destroy(fsPathTable); WARN_OFF(cast_function_type) - g_list_foreach(fsTopList_items, (GFunc)g_free, NULL); // deliberate cast between incompatible function types + g_list_foreach(fsPathList, (GFunc)g_free, NULL); // deliberate cast between incompatible function types WARN_ON - g_list_free(fsTopList_items); - fsTopList_items = NULL; + g_list_free(fsPathList); + fsPathList = NULL; } static GtkWidget *CreateFileSelect(void) @@ -963,17 +963,17 @@ void ShowFileSelector(int type) if (fname) fs_AddPathUtf8(fname, GTK_POS_BOTTOM); else - fsTopList_items = fs_AddPath(fsTopList_items, g_strdup("/home"), GTK_POS_BOTTOM); + fsPathList = fs_AddPath(fsPathList, g_strdup("/home"), GTK_POS_BOTTOM); if (stat("/media", &f) == 0) - fsTopList_items = fs_AddPath(fsTopList_items, g_strdup("/media"), GTK_POS_BOTTOM); + fsPathList = fs_AddPath(fsPathList, g_strdup("/media"), GTK_POS_BOTTOM); if (stat("/mnt", &f) == 0) - fsTopList_items = fs_AddPath(fsTopList_items, g_strdup("/mnt"), GTK_POS_BOTTOM); + fsPathList = fs_AddPath(fsPathList, g_strdup("/mnt"), GTK_POS_BOTTOM); - fsTopList_items = fs_AddPath(fsTopList_items, g_strdup("/"), GTK_POS_BOTTOM); + fsPathList = fs_AddPath(fsPathList, g_strdup("/"), GTK_POS_BOTTOM); - list = fsTopList_items; + list = fsPathList; gtk_list_store_clear(GTK_LIST_STORE(gtk_combo_box_get_model(GTK_COMBO_BOX(fsPathCombo)))); while (list) {

1 0

r38533 - trunk/gui/dialog/fileselect.c
by ib 17 May '24

17 May '24

Author: ib Date: Fri May 17 20:41:33 2024 New Revision: 38533 Log: Remove an unused argument. Modified: trunk/gui/dialog/fileselect.c Modified: trunk/gui/dialog/fileselect.c ============================================================================== --- trunk/gui/dialog/fileselect.c Thu May 16 23:24:48 2024 (r38532) +++ trunk/gui/dialog/fileselect.c Fri May 17 20:41:33 2024 (r38533) @@ -834,7 +834,7 @@ static GtkWidget *CreateFileSelect(void) g_signal_connect(G_OBJECT(fsPathCombo), "changed", G_CALLBACK(fs_fsPathCombo_changed), fsPathCombo); g_signal_connect(G_OBJECT(fsPathCombo), "key-release-event", G_CALLBACK(fs_key_release_event), NULL); g_signal_connect(G_OBJECT(fsUp), "clicked", G_CALLBACK(fs_Up_released), fsFNameList); - g_signal_connect(G_OBJECT(fsOk), "clicked", G_CALLBACK(fs_Ok_released), fsPathCombo); + g_signal_connect(G_OBJECT(fsOk), "clicked", G_CALLBACK(fs_Ok_released), NULL); g_signal_connect(G_OBJECT(fsCancel), "clicked", G_CALLBACK(fs_Cancel_released), NULL); g_signal_connect(G_OBJECT(fsFNameList), "select-row", G_CALLBACK(fs_fsFNameList_select_row), NULL); g_signal_connect(G_OBJECT(fsFNameList), "event", G_CALLBACK(fs_fsFNameList_event), NULL);

1 0