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

r38635 - in trunk/gui/dialog: equalizer.c preferences.c
by ib 25 Jun '24

25 Jun '24

Author: ib Date: Tue Jun 25 15:37:16 2024 New Revision: 38635 Log: Remove unused array elements. An empty "" at the end is unnecessary. Only as many elements are needed as the number of columns specified in the gtk_clist_new() call. Modified: trunk/gui/dialog/equalizer.c trunk/gui/dialog/preferences.c Modified: trunk/gui/dialog/equalizer.c ============================================================================== --- trunk/gui/dialog/equalizer.c Tue Jun 25 15:36:13 2024 (r38634) +++ trunk/gui/dialog/equalizer.c Tue Jun 25 15:37:16 2024 (r38635) @@ -146,9 +146,8 @@ static void eqSetBands( int channel ) static void eqSetChannelNames( void ) { - gchar * str[2]; + gchar *str[1]; gtk_clist_clear( GTK_CLIST( ChannelsList ) ); - str[1]=""; str[0]=_(MSGTR_GUI_ChannelAll); gtk_clist_append( GTK_CLIST( ChannelsList ) ,str); if ( guiInfo.AudioChannels > 1 ) Modified: trunk/gui/dialog/preferences.c ============================================================================== --- trunk/gui/dialog/preferences.c Tue Jun 25 15:36:13 2024 (r38634) +++ trunk/gui/dialog/preferences.c Tue Jun 25 15:37:16 2024 (r38635) @@ -1322,7 +1322,7 @@ void ShowPreferences( void ) gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBSoftwareMixer ),soft_vol ); { int i = 0, c = 0, my_audio_driver = -1; - char * tmp[3]; tmp[2]=""; + char *tmp[2]; if ( CLADrivers ) gtk_clist_clear( GTK_CLIST( CLADrivers ) ); while ( audio_out_drivers[i] ) { @@ -1368,7 +1368,7 @@ void ShowPreferences( void ) { int i = 0, c = 0, my_video_driver = -1; - char * tmp[3]; tmp[2]=""; + char *tmp[2]; if ( CLVDrivers ) gtk_clist_clear( GTK_CLIST( CLVDrivers ) ); while ( video_out_drivers[i] ) if ( video_out_drivers[i++]->control( VOCTRL_GUISUPPORT,NULL ) == VO_TRUE )

1 0

r38634 - trunk/gui/dialog/preferences.c
by ib 25 Jun '24

25 Jun '24

Author: ib Date: Tue Jun 25 15:36:13 2024 New Revision: 38634 Log: Rename variables. This should better clarify their meanings. Modified: trunk/gui/dialog/preferences.c Modified: trunk/gui/dialog/preferences.c ============================================================================== --- trunk/gui/dialog/preferences.c Tue Jun 25 15:34:06 2024 (r38633) +++ trunk/gui/dialog/preferences.c Tue Jun 25 15:36:13 2024 (r38634) @@ -1321,7 +1321,7 @@ void ShowPreferences( void ) gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBNormalize ),gtkAONorm ); gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBSoftwareMixer ),soft_vol ); { - int i = 0, c = 0, old_audio_driver = -1; + int i = 0, c = 0, my_audio_driver = -1; char * tmp[3]; tmp[2]=""; if ( CLADrivers ) gtk_clist_clear( GTK_CLIST( CLADrivers ) ); while ( audio_out_drivers[i] ) @@ -1335,13 +1335,13 @@ void ShowPreferences( void ) char * name = gstrdup( audio_driver_list[0] ); char * sep = gstrchr( name,':' ); if ( sep ) *sep=0; - if ( !gstrcmp( name,info->short_name ) && !audio_driver_list[1] ) old_audio_driver=c; + if ( !gstrcmp( name,info->short_name ) && !audio_driver_list[1] ) my_audio_driver=c; free( name ); } c++; tmp[0]=(char *)info->short_name; tmp[1]=(char *)info->name; gtk_clist_append( GTK_CLIST( CLADrivers ),tmp ); } - if (old_audio_driver > -1) gtk_clist_select_row(GTK_CLIST(CLADrivers), old_audio_driver, 0); + if (my_audio_driver > -1) gtk_clist_select_row(GTK_CLIST(CLADrivers), my_audio_driver, 0); else { ao_driver = NULL; @@ -1367,18 +1367,18 @@ void ShowPreferences( void ) gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBFlip ),flip ); { - int i = 0, c = 0, old_video_driver = -1; + int i = 0, c = 0, my_video_driver = -1; char * tmp[3]; tmp[2]=""; if ( CLVDrivers ) gtk_clist_clear( GTK_CLIST( CLVDrivers ) ); while ( video_out_drivers[i] ) if ( video_out_drivers[i++]->control( VOCTRL_GUISUPPORT,NULL ) == VO_TRUE ) { - if ( video_driver_list && !gstrcmp( video_driver_list[0],video_out_drivers[i - 1]->info->short_name ) && !video_driver_list[1] ) old_video_driver=c; + if ( video_driver_list && !gstrcmp( video_driver_list[0],video_out_drivers[i - 1]->info->short_name ) && !video_driver_list[1] ) my_video_driver=c; c++; tmp[0]=(char *)video_out_drivers[i - 1]->info->short_name; tmp[1]=(char *)video_out_drivers[i - 1]->info->name; gtk_clist_append( GTK_CLIST( CLVDrivers ),tmp ); } - if (old_video_driver > -1) gtk_clist_select_row(GTK_CLIST(CLVDrivers), old_video_driver, 0); + if (my_video_driver > -1) gtk_clist_select_row(GTK_CLIST(CLVDrivers), my_video_driver, 0); else { vo_driver = NULL;

1 0

r38633 - trunk/gui/dialog/preferences.c
by ib 25 Jun '24

25 Jun '24

Author: ib Date: Tue Jun 25 15:34:06 2024 New Revision: 38633 Log: Avoid code duplication. Make use of the identical code in prCListRow, which is called by gtk_clist_select_row() anyway. Modified: trunk/gui/dialog/preferences.c Modified: trunk/gui/dialog/preferences.c ============================================================================== --- trunk/gui/dialog/preferences.c Tue Jun 25 15:33:20 2024 (r38632) +++ trunk/gui/dialog/preferences.c Tue Jun 25 15:34:06 2024 (r38633) @@ -1341,18 +1341,12 @@ void ShowPreferences( void ) c++; tmp[0]=(char *)info->short_name; tmp[1]=(char *)info->name; gtk_clist_append( GTK_CLIST( CLADrivers ),tmp ); } - if ( old_audio_driver > -1 ) - { - gtk_clist_select_row( GTK_CLIST( CLADrivers ),old_audio_driver,0 ); - gtk_clist_get_text( GTK_CLIST( CLADrivers ),old_audio_driver,0,&ao_driver ); - gtk_widget_set_sensitive( AConfig,FALSE ); - if ( !strncmp( ao_driver,"oss",3 ) || - !strncmp( ao_driver,"alsa",4 ) || - !strncmp( ao_driver,"esd",3 ) || - !strncmp( ao_driver,"sdl",3 ) ) - gtk_widget_set_sensitive( AConfig,TRUE ); - } - else ao_driver = NULL; + if (old_audio_driver > -1) gtk_clist_select_row(GTK_CLIST(CLADrivers), old_audio_driver, 0); + else + { + ao_driver = NULL; + gtk_widget_set_sensitive(AConfig, FALSE); + } } /* 2nd page */ @@ -1384,13 +1378,12 @@ void ShowPreferences( void ) tmp[0]=(char *)video_out_drivers[i - 1]->info->short_name; tmp[1]=(char *)video_out_drivers[i - 1]->info->name; gtk_clist_append( GTK_CLIST( CLVDrivers ),tmp ); } - vo_driver = NULL; - gtk_clist_select_row( GTK_CLIST( CLVDrivers ),old_video_driver,0 ); - gtk_clist_get_text( GTK_CLIST( CLVDrivers ),old_video_driver,0,&vo_driver ); - gtk_widget_set_sensitive( VConfig,FALSE ); -#ifdef CONFIG_DXR3 - if ( !gstrcmp( vo_driver,"dxr3" ) ) gtk_widget_set_sensitive( VConfig,TRUE ); -#endif + if (old_video_driver > -1) gtk_clist_select_row(GTK_CLIST(CLVDrivers), old_video_driver, 0); + else + { + vo_driver = NULL; + gtk_widget_set_sensitive(VConfig, FALSE); + } } gtk_adjustment_set_value( HSFPSadj,force_fps );

1 0

r38632 - trunk/gui/dialog/preferences.c
by ib 25 Jun '24

25 Jun '24

Author: ib Date: Tue Jun 25 15:33:20 2024 New Revision: 38632 Log: Remove useless arrays. The GUI supports only one driver each. Modified: trunk/gui/dialog/preferences.c Modified: trunk/gui/dialog/preferences.c ============================================================================== --- trunk/gui/dialog/preferences.c Tue Jun 25 15:32:44 2024 (r38631) +++ trunk/gui/dialog/preferences.c Tue Jun 25 15:33:20 2024 (r38632) @@ -210,8 +210,8 @@ static struct }; #endif -static char * ao_driver[3]; -static char * vo_driver[3]; +static char *ao_driver; +static char *vo_driver; static float old_gtkAOExtraStereoMul; static float old_audio_delay; @@ -336,8 +336,8 @@ static void prButton( GtkButton * button gtkAONorm=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBNormalize ) ); soft_vol=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBSoftwareMixer ) ); - if (ao_driver[0]) listSet(&audio_driver_list, ao_driver[0]); - if (vo_driver[0]) listSet(&video_driver_list, vo_driver[0]); + if (ao_driver) listSet(&audio_driver_list, ao_driver); + if (vo_driver) listSet(&video_driver_list, vo_driver); /* 2nd page */ vo_doublebuffering=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBDoubleBuffer ) ); @@ -460,21 +460,21 @@ destroy: #endif break; case bAConfig: - if ( !ao_driver[0] ) break; + if ( !ao_driver ) break; gtk_widget_set_sensitive( AConfig,FALSE ); - if ( !strncmp( ao_driver[0],"oss",3 ) || - !strncmp( ao_driver[0],"alsa",4 ) || - !strncmp( ao_driver[0],"esd",3 ) || - !strncmp( ao_driver[0],"sdl",3 ) ) { + if ( !strncmp( ao_driver,"oss",3 ) || + !strncmp( ao_driver,"alsa",4 ) || + !strncmp( ao_driver,"esd",3 ) || + !strncmp( ao_driver,"sdl",3 ) ) { ShowAudioConfig(); gtk_widget_set_sensitive( AConfig,TRUE ); } break; case bVconfig: - if ( !vo_driver[0] ) break; + if ( !vo_driver ) break; gtk_widget_set_sensitive( VConfig,FALSE ); #ifdef CONFIG_DXR3 - if ( !gstrcmp( vo_driver[0],"dxr3" ) ) { ShowDXR3Config(); gtk_widget_set_sensitive( VConfig,TRUE ); } + if ( !gstrcmp( vo_driver,"dxr3" ) ) { ShowDXR3Config(); gtk_widget_set_sensitive( VConfig,TRUE ); } #endif break; #if 0 @@ -616,19 +616,19 @@ static void prCListRow( GtkCList * clist switch ( GPOINTER_TO_INT(user_data) ) { case 0: // audio driver - gtk_clist_get_text( GTK_CLIST( CLADrivers ),row,0,(char **)&ao_driver ); + gtk_clist_get_text( GTK_CLIST( CLADrivers ),row,0,&ao_driver ); gtk_widget_set_sensitive( AConfig,FALSE ); - if ( !strncmp( ao_driver[0],"oss",3 ) || - !strncmp( ao_driver[0],"alsa",4 ) || - !strncmp( ao_driver[0],"esd",3 ) || - !strncmp( ao_driver[0],"sdl",3 ) ) + if ( !strncmp( ao_driver,"oss",3 ) || + !strncmp( ao_driver,"alsa",4 ) || + !strncmp( ao_driver,"esd",3 ) || + !strncmp( ao_driver,"sdl",3 ) ) gtk_widget_set_sensitive( AConfig,TRUE ); break; case 1: // video driver - gtk_clist_get_text( GTK_CLIST( CLVDrivers ),row,0,(char **)&vo_driver ); + gtk_clist_get_text( GTK_CLIST( CLVDrivers ),row,0,&vo_driver ); gtk_widget_set_sensitive( VConfig,FALSE ); #ifdef CONFIG_DXR3 - if ( !gstrcmp( vo_driver[0],"dxr3" ) ) gtk_widget_set_sensitive( VConfig,TRUE ); + if ( !gstrcmp( vo_driver,"dxr3" ) ) gtk_widget_set_sensitive( VConfig,TRUE ); #endif break; } @@ -1344,15 +1344,15 @@ void ShowPreferences( void ) if ( old_audio_driver > -1 ) { gtk_clist_select_row( GTK_CLIST( CLADrivers ),old_audio_driver,0 ); - gtk_clist_get_text( GTK_CLIST( CLADrivers ),old_audio_driver,0,(char **)&ao_driver ); + gtk_clist_get_text( GTK_CLIST( CLADrivers ),old_audio_driver,0,&ao_driver ); gtk_widget_set_sensitive( AConfig,FALSE ); - if ( !strncmp( ao_driver[0],"oss",3 ) || - !strncmp( ao_driver[0],"alsa",4 ) || - !strncmp( ao_driver[0],"esd",3 ) || - !strncmp( ao_driver[0],"sdl",3 ) ) + if ( !strncmp( ao_driver,"oss",3 ) || + !strncmp( ao_driver,"alsa",4 ) || + !strncmp( ao_driver,"esd",3 ) || + !strncmp( ao_driver,"sdl",3 ) ) gtk_widget_set_sensitive( AConfig,TRUE ); } - else ao_driver[0] = NULL; + else ao_driver = NULL; } /* 2nd page */ @@ -1384,12 +1384,12 @@ void ShowPreferences( void ) tmp[0]=(char *)video_out_drivers[i - 1]->info->short_name; tmp[1]=(char *)video_out_drivers[i - 1]->info->name; gtk_clist_append( GTK_CLIST( CLVDrivers ),tmp ); } - vo_driver[0] = NULL; + vo_driver = NULL; gtk_clist_select_row( GTK_CLIST( CLVDrivers ),old_video_driver,0 ); - gtk_clist_get_text( GTK_CLIST( CLVDrivers ),old_video_driver,0,(char **)&vo_driver ); + gtk_clist_get_text( GTK_CLIST( CLVDrivers ),old_video_driver,0,&vo_driver ); gtk_widget_set_sensitive( VConfig,FALSE ); #ifdef CONFIG_DXR3 - if ( !gstrcmp( vo_driver[0],"dxr3" ) ) gtk_widget_set_sensitive( VConfig,TRUE ); + if ( !gstrcmp( vo_driver,"dxr3" ) ) gtk_widget_set_sensitive( VConfig,TRUE ); #endif } @@ -1711,7 +1711,7 @@ static void audioButton(GtkButton *butto switch( GPOINTER_TO_INT(user_data) ) { case 1: #ifdef CONFIG_OSS_AUDIO - if (strncmp(ao_driver[0], "oss", 3) == 0) { + if (strncmp(ao_driver, "oss", 3) == 0) { nfree(gtkAOOSSDevice); gtkAOOSSDevice = gstrdup(getGtkEntryText(CBAudioDevice)); nfree(gtkAOOSSMixer); @@ -1721,7 +1721,7 @@ static void audioButton(GtkButton *butto } #endif #ifdef CONFIG_ALSA - if (strncmp(ao_driver[0], "alsa", 4) == 0) { + if (strncmp(ao_driver, "alsa", 4) == 0) { nfree(gtkAOALSADevice); gtkAOALSADevice = gstrdup(getGtkEntryText(CBAudioDevice)); nfree(gtkAOALSAMixer); @@ -1731,13 +1731,13 @@ static void audioButton(GtkButton *butto } #endif #ifdef CONFIG_SDL - if (strncmp(ao_driver[0], "sdl", 3) == 0) { + if (strncmp(ao_driver, "sdl", 3) == 0) { nfree(gtkAOSDLDriver); gtkAOSDLDriver = gstrdup(getGtkEntryText(CBAudioDevice)); } #endif #ifdef CONFIG_ESD - if (strncmp(ao_driver[0], "esd", 3) == 0) { + if (strncmp(ao_driver, "esd", 3) == 0) { nfree(gtkAOESDDevice); gtkAOESDDevice = gstrdup(getGtkEntryText(CBAudioDevice)); } @@ -1780,19 +1780,19 @@ static GtkWidget *CreateAudioConfig( voi gtk_table_attach(GTK_TABLE(table), CBAudioDevice, 1, 2, 0, 1, (GtkAttachOptions)(GTK_EXPAND | GTK_FILL), (GtkAttachOptions)(0), 0, 0); items = g_slist_append(items, _(MSGTR_GUI_DefaultSetting)); #ifdef CONFIG_OSS_AUDIO - if (strncmp(ao_driver[0], "oss", 3) == 0) + if (strncmp(ao_driver, "oss", 3) == 0) items = appendOSSDevices(items); #endif #ifdef CONFIG_ALSA - if (strncmp(ao_driver[0], "alsa", 4) == 0) + if (strncmp(ao_driver, "alsa", 4) == 0) items = appendALSADevices(items); #endif #ifdef CONFIG_SDL - if (strncmp(ao_driver[0], "sdl", 3) == 0) + if (strncmp(ao_driver, "sdl", 3) == 0) items = appendSDLDevices(items); #endif #ifdef CONFIG_ESD - if (strncmp(ao_driver[0], "esd", 3) == 0) + if (strncmp(ao_driver, "esd", 3) == 0) items = appendESDDevices(items); #endif @@ -1814,11 +1814,11 @@ static GtkWidget *CreateAudioConfig( voi gtk_table_attach(GTK_TABLE(table), CBAudioMixer, 1, 2, 1, 2, (GtkAttachOptions)(GTK_EXPAND | GTK_FILL), (GtkAttachOptions)(0), 0, 0); items = g_slist_append(items, _(MSGTR_GUI_DefaultSetting)); #ifdef CONFIG_OSS_AUDIO - if (strncmp(ao_driver[0], "oss", 3) == 0) + if (strncmp(ao_driver, "oss", 3) == 0) items = appendOSSMixers(items); #endif #ifdef CONFIG_ALSA - if (strncmp(ao_driver[0], "alsa", 4) == 0) + if (strncmp(ao_driver, "alsa", 4) == 0) items = appendALSAMixers(items); #endif @@ -1840,11 +1840,11 @@ static GtkWidget *CreateAudioConfig( voi gtk_table_attach(GTK_TABLE(table), CBAudioMixerChannel, 1, 2, 2, 3, (GtkAttachOptions)(GTK_EXPAND | GTK_FILL), (GtkAttachOptions)(0), 0, 0); items = g_slist_append(items, _(MSGTR_GUI_DefaultSetting)); #ifdef CONFIG_OSS_AUDIO - if (strncmp(ao_driver[0], "oss", 3) == 0) + if (strncmp(ao_driver, "oss", 3) == 0) items = appendOSSMixerChannels(items); #endif #ifdef CONFIG_ALSA - if (strncmp(ao_driver[0], "alsa", 4) == 0) + if (strncmp(ao_driver, "alsa", 4) == 0) items = appendALSAMixerChannels(items); #endif @@ -1887,26 +1887,26 @@ void ShowAudioConfig( void ) { else AudioConfig = CreateAudioConfig(); #ifdef CONFIG_OSS_AUDIO - if (strncmp(ao_driver[0], "oss", 3) == 0) { + if (strncmp(ao_driver, "oss", 3) == 0) { setGtkEntryText(CBAudioDevice, gtkAOOSSDevice); setGtkEntryText(CBAudioMixer, gtkAOOSSMixer); setGtkEntryText(CBAudioMixerChannel, gtkAOOSSMixerChannel); } #endif #ifdef CONFIG_ALSA - if (strncmp(ao_driver[0], "alsa", 4) == 0) { + if (strncmp(ao_driver, "alsa", 4) == 0) { setGtkEntryText(CBAudioDevice, gtkAOALSADevice); setGtkEntryText(CBAudioMixer, gtkAOALSAMixer); setGtkEntryText(CBAudioMixerChannel, gtkAOALSAMixerChannel); } #endif #ifdef CONFIG_SDL - if (strncmp(ao_driver[0], "sdl", 3) == 0) { + if (strncmp(ao_driver, "sdl", 3) == 0) { setGtkEntryText(CBAudioDevice, gtkAOSDLDriver); } #endif #ifdef CONFIG_ESD - if (strncmp(ao_driver[0], "esd", 3) == 0) { + if (strncmp(ao_driver, "esd", 3) == 0) { setGtkEntryText(CBAudioDevice, gtkAOESDDevice); } #endif

1 0

r38631 - trunk/gui/dialog/preferences.c
by ib 25 Jun '24

25 Jun '24

Author: ib Date: Tue Jun 25 15:32:44 2024 New Revision: 38631 Log: Make variables local that are unnecessarily global. Modified: trunk/gui/dialog/preferences.c Modified: trunk/gui/dialog/preferences.c ============================================================================== --- trunk/gui/dialog/preferences.c Tue Jun 25 15:32:01 2024 (r38630) +++ trunk/gui/dialog/preferences.c Tue Jun 25 15:32:44 2024 (r38631) @@ -210,10 +210,8 @@ static struct }; #endif -static int old_audio_driver = 0; static char * ao_driver[3]; static char * vo_driver[3]; -static int old_video_driver = 0; static float old_gtkAOExtraStereoMul; static float old_audio_delay; @@ -1323,9 +1321,8 @@ void ShowPreferences( void ) gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBNormalize ),gtkAONorm ); gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBSoftwareMixer ),soft_vol ); { - int i = 0, c = 0; + int i = 0, c = 0, old_audio_driver = -1; char * tmp[3]; tmp[2]=""; - old_audio_driver=-1; if ( CLADrivers ) gtk_clist_clear( GTK_CLIST( CLADrivers ) ); while ( audio_out_drivers[i] ) { @@ -1376,9 +1373,8 @@ void ShowPreferences( void ) gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBFlip ),flip ); { - int i = 0, c = 0; + int i = 0, c = 0, old_video_driver = -1; char * tmp[3]; tmp[2]=""; - old_video_driver = -1; if ( CLVDrivers ) gtk_clist_clear( GTK_CLIST( CLVDrivers ) ); while ( video_out_drivers[i] ) if ( video_out_drivers[i++]->control( VOCTRL_GUISUPPORT,NULL ) == VO_TRUE )

1 0

r38630 - trunk/gui/interface.c
by ib 25 Jun '24

25 Jun '24

Author: ib Date: Tue Jun 25 15:32:01 2024 New Revision: 38630 Log: Access the demuxer in a less complicated way. Modified: trunk/gui/interface.c Modified: trunk/gui/interface.c ============================================================================== --- trunk/gui/interface.c Tue Jun 25 15:28:11 2024 (r38629) +++ trunk/gui/interface.c Tue Jun 25 15:32:01 2024 (r38630) @@ -904,7 +904,7 @@ int gui(int what, void *data) btnSet(evBackward10min, state); btnSet(evSetMoviePosition, state); - if (video_driver_list && !gstrcmp(video_driver_list[0], "dxr3") && (((demuxer_t *)mpctx_get_demuxer(guiInfo.mpcontext))->file_format != DEMUXER_TYPE_MPEG_PS) && !gtkVfLAVC) { + if (video_driver_list && !gstrcmp(video_driver_list[0], "dxr3") && (guiInfo.mpcontext->demuxer->file_format != DEMUXER_TYPE_MPEG_PS) && !gtkVfLAVC) { gtkMessageBox(MSGBOX_FATAL, _(MSGTR_GUI_MSG_DXR3NeedsLavc)); return False; }

1 0

r38629 - trunk/gui/dialog/equalizer.c
by ib 25 Jun '24

25 Jun '24

Author: ib Date: Tue Jun 25 15:28:11 2024 New Revision: 38629 Log: Set slider labels of the frequencies to sensitive. Since the slider values are not displayed this time, it is otherwise difficult for the user to tell whether the sliders are available for use or not. Modified: trunk/gui/dialog/equalizer.c Modified: trunk/gui/dialog/equalizer.c ============================================================================== --- trunk/gui/dialog/equalizer.c Tue Jun 25 15:23:53 2024 (r38628) +++ trunk/gui/dialog/equalizer.c Tue Jun 25 15:28:11 2024 (r38629) @@ -56,6 +56,7 @@ static GtkWidget * ChannelsList; static GtkWidget * VContrast, * VBrightness, * VHue, * VSaturation; static GtkAdjustment * VContrastadj, * VBrightnessadj, * VHueadj, * VSaturationadj; static GtkWidget * Ok, * Clear, * Config; +static GtkWidget *Frequency0, *Frequency1, *Frequency2, *Frequency3, *Frequency4, *Frequency5, *Frequency6, *Frequency7, *Frequency8, *Frequency9; static GtkWidget * A3125, * A125, * A6250, * A250, * A500, * A1000, * A2000, * A4000, * A8000, * A16000; static GtkAdjustment * A3125adj, * A125adj, * A6250adj, * A250adj, * A500adj, * A1000adj, * A2000adj, * A4000adj, * A8000adj, * A16000adj; @@ -396,43 +397,43 @@ static GtkWidget * CreateEqualizer( void eqSetBands(0); gtk_table_attach( GTK_TABLE( table1 ), - gtkAddLabel( _(MSGTR_GUI_Frequency0),NULL ), + Frequency0 = gtkAddLabel( _(MSGTR_GUI_Frequency0),NULL ), 0,1,1,2,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); gtk_table_attach( GTK_TABLE( table1 ), - gtkAddLabel( _(MSGTR_GUI_Frequency1),NULL ), + Frequency1 = gtkAddLabel( _(MSGTR_GUI_Frequency1),NULL ), 1,2,1,2,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); gtk_table_attach( GTK_TABLE( table1 ), - gtkAddLabel( _(MSGTR_GUI_Frequency2),NULL ), + Frequency2 = gtkAddLabel( _(MSGTR_GUI_Frequency2),NULL ), 2,3,1,2,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); gtk_table_attach( GTK_TABLE( table1 ), - gtkAddLabel( _(MSGTR_GUI_Frequency3),NULL ), + Frequency3 = gtkAddLabel( _(MSGTR_GUI_Frequency3),NULL ), 3,4,1,2,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); gtk_table_attach( GTK_TABLE( table1 ), - gtkAddLabel( _(MSGTR_GUI_Frequency4),NULL ), + Frequency4 = gtkAddLabel( _(MSGTR_GUI_Frequency4),NULL ), 4,5,1,2,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); gtk_table_attach( GTK_TABLE( table1 ), - gtkAddLabel( _(MSGTR_GUI_Frequency5),NULL ), + Frequency5 = gtkAddLabel( _(MSGTR_GUI_Frequency5),NULL ), 5,6,1,2,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); gtk_table_attach( GTK_TABLE( table1 ), - gtkAddLabel( _(MSGTR_GUI_Frequency6),NULL ), + Frequency6 = gtkAddLabel( _(MSGTR_GUI_Frequency6),NULL ), 6,7,1,2,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); gtk_table_attach( GTK_TABLE( table1 ), - gtkAddLabel( _(MSGTR_GUI_Frequency7),NULL ), + Frequency7 = gtkAddLabel( _(MSGTR_GUI_Frequency7),NULL ), 7,8,1,2,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); gtk_table_attach( GTK_TABLE( table1 ), - gtkAddLabel( _(MSGTR_GUI_Frequency8),NULL ), + Frequency8 = gtkAddLabel( _(MSGTR_GUI_Frequency8),NULL ), 8,9,1,2,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); gtk_table_attach( GTK_TABLE( table1 ), - gtkAddLabel( _(MSGTR_GUI_Frequency9),NULL ), + Frequency9 = gtkAddLabel( _(MSGTR_GUI_Frequency9),NULL ), 9,10,1,2,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); gtk_notebook_set_tab_label( GTK_NOTEBOOK( Notebook ),gtk_notebook_get_nth_page( GTK_NOTEBOOK( Notebook ),0 ), @@ -566,6 +567,16 @@ void ShowEqualizer( void ) gtk_widget_set_sensitive(A4000, set); gtk_widget_set_sensitive(A8000, set); gtk_widget_set_sensitive(A16000, set); + gtk_widget_set_sensitive(Frequency0, set); + gtk_widget_set_sensitive(Frequency1, set); + gtk_widget_set_sensitive(Frequency2, set); + gtk_widget_set_sensitive(Frequency3, set); + gtk_widget_set_sensitive(Frequency4, set); + gtk_widget_set_sensitive(Frequency5, set); + gtk_widget_set_sensitive(Frequency6, set); + gtk_widget_set_sensitive(Frequency7, set); + gtk_widget_set_sensitive(Frequency8, set); + gtk_widget_set_sensitive(Frequency9, set); gtk_widget_show( Equalizer ); }

1 0

r38628 - trunk/gui/dialog/equalizer.c
by ib 25 Jun '24

25 Jun '24

Author: ib Date: Tue Jun 25 15:23:53 2024 New Revision: 38628 Log: Block signal handler eqHScaleChanged when calling (internal) eqSetBands(). eqSetBands() should only set the sliders to the gain values that have already been set with MPLAYER_SET_EQUALIZER. Only moving a slider by the user should cause a MPLAYER_SET_EQUALIZER change, not the (subsequent) setting of the slider value. Modified: trunk/gui/dialog/equalizer.c Modified: trunk/gui/dialog/equalizer.c ============================================================================== --- trunk/gui/dialog/equalizer.c Tue Jun 25 15:22:38 2024 (r38627) +++ trunk/gui/dialog/equalizer.c Tue Jun 25 15:23:53 2024 (r38628) @@ -76,8 +76,49 @@ char * gtkEquChannel6 = NULL; void ShowEquConfig( void ); +static void eqHScaleChanged (GtkRange *range, gpointer user_data) +{ + equalizer_t eq; + + (void) range; + + switch ( GPOINTER_TO_INT(user_data) ) + { + case 0: eq.gain=gtk_adjustment_get_value(A3125adj); break; + case 1: eq.gain=gtk_adjustment_get_value(A6250adj); break; + case 2: eq.gain=gtk_adjustment_get_value(A125adj); break; + case 3: eq.gain=gtk_adjustment_get_value(A250adj); break; + case 4: eq.gain=gtk_adjustment_get_value(A500adj); break; + case 5: eq.gain=gtk_adjustment_get_value(A1000adj); break; + case 6: eq.gain=gtk_adjustment_get_value(A2000adj); break; + case 7: eq.gain=gtk_adjustment_get_value(A4000adj); break; + case 8: eq.gain=gtk_adjustment_get_value(A8000adj); break; + case 9: eq.gain=gtk_adjustment_get_value(A16000adj); break; + default: return; + } + eq.gain=-eq.gain; + eq.band=GPOINTER_TO_INT(user_data); + if ( Channel == -1 ) + { + int i; + for ( i=0;i<6;i++ ) + { eq.channel=i; mplayer( MPLAYER_SET_EQUALIZER,0,&eq ); } + } else { eq.channel=Channel; mplayer( MPLAYER_SET_EQUALIZER,0,&eq ); } +} + static void eqSetBands( int channel ) { + g_signal_handlers_block_by_func(G_OBJECT(A3125), G_CALLBACK(eqHScaleChanged), GINT_TO_POINTER(0)); + g_signal_handlers_block_by_func(G_OBJECT(A6250), G_CALLBACK(eqHScaleChanged), GINT_TO_POINTER(1)); + g_signal_handlers_block_by_func(G_OBJECT(A125), G_CALLBACK(eqHScaleChanged), GINT_TO_POINTER(2)); + g_signal_handlers_block_by_func(G_OBJECT(A250), G_CALLBACK(eqHScaleChanged), GINT_TO_POINTER(3)); + g_signal_handlers_block_by_func(G_OBJECT(A500), G_CALLBACK(eqHScaleChanged), GINT_TO_POINTER(4)); + g_signal_handlers_block_by_func(G_OBJECT(A1000), G_CALLBACK(eqHScaleChanged), GINT_TO_POINTER(5)); + g_signal_handlers_block_by_func(G_OBJECT(A2000), G_CALLBACK(eqHScaleChanged), GINT_TO_POINTER(6)); + g_signal_handlers_block_by_func(G_OBJECT(A4000), G_CALLBACK(eqHScaleChanged), GINT_TO_POINTER(7)); + g_signal_handlers_block_by_func(G_OBJECT(A8000), G_CALLBACK(eqHScaleChanged), GINT_TO_POINTER(8)); + g_signal_handlers_block_by_func(G_OBJECT(A16000), G_CALLBACK(eqHScaleChanged), GINT_TO_POINTER(9)); + if ( channel < 0 ) channel=0; gtk_adjustment_set_value( A3125adj,-gtkEquChannels[channel][0] ); gtk_adjustment_set_value( A6250adj,-gtkEquChannels[channel][1] ); @@ -89,6 +130,17 @@ static void eqSetBands( int channel ) gtk_adjustment_set_value( A4000adj,-gtkEquChannels[channel][7] ); gtk_adjustment_set_value( A8000adj,-gtkEquChannels[channel][8] ); gtk_adjustment_set_value( A16000adj,-gtkEquChannels[channel][9] ); + + g_signal_handlers_unblock_by_func(G_OBJECT(A16000), G_CALLBACK(eqHScaleChanged), GINT_TO_POINTER(9)); + g_signal_handlers_unblock_by_func(G_OBJECT(A8000), G_CALLBACK(eqHScaleChanged), GINT_TO_POINTER(8)); + g_signal_handlers_unblock_by_func(G_OBJECT(A4000), G_CALLBACK(eqHScaleChanged), GINT_TO_POINTER(7)); + g_signal_handlers_unblock_by_func(G_OBJECT(A2000), G_CALLBACK(eqHScaleChanged), GINT_TO_POINTER(6)); + g_signal_handlers_unblock_by_func(G_OBJECT(A1000), G_CALLBACK(eqHScaleChanged), GINT_TO_POINTER(5)); + g_signal_handlers_unblock_by_func(G_OBJECT(A500), G_CALLBACK(eqHScaleChanged), GINT_TO_POINTER(4)); + g_signal_handlers_unblock_by_func(G_OBJECT(A250), G_CALLBACK(eqHScaleChanged), GINT_TO_POINTER(3)); + g_signal_handlers_unblock_by_func(G_OBJECT(A125), G_CALLBACK(eqHScaleChanged), GINT_TO_POINTER(2)); + g_signal_handlers_unblock_by_func(G_OBJECT(A6250), G_CALLBACK(eqHScaleChanged), GINT_TO_POINTER(1)); + g_signal_handlers_unblock_by_func(G_OBJECT(A3125), G_CALLBACK(eqHScaleChanged), GINT_TO_POINTER(0)); } static void eqSetChannelNames( void ) @@ -115,36 +167,6 @@ static void eqSetChannelNames( void ) } } -static void eqHScaleChanged (GtkRange *range, gpointer user_data) -{ - equalizer_t eq; - - (void) range; - - switch ( GPOINTER_TO_INT(user_data) ) - { - case 0: eq.gain=gtk_adjustment_get_value(A3125adj); break; - case 1: eq.gain=gtk_adjustment_get_value(A6250adj); break; - case 2: eq.gain=gtk_adjustment_get_value(A125adj); break; - case 3: eq.gain=gtk_adjustment_get_value(A250adj); break; - case 4: eq.gain=gtk_adjustment_get_value(A500adj); break; - case 5: eq.gain=gtk_adjustment_get_value(A1000adj); break; - case 6: eq.gain=gtk_adjustment_get_value(A2000adj); break; - case 7: eq.gain=gtk_adjustment_get_value(A4000adj); break; - case 8: eq.gain=gtk_adjustment_get_value(A8000adj); break; - case 9: eq.gain=gtk_adjustment_get_value(A16000adj); break; - default: return; - } - eq.gain=-eq.gain; - eq.band=GPOINTER_TO_INT(user_data); - if ( Channel == -1 ) - { - int i; - for ( i=0;i<6;i++ ) - { eq.channel=i; mplayer( MPLAYER_SET_EQUALIZER,0,&eq ); } - } else { eq.channel=Channel; mplayer( MPLAYER_SET_EQUALIZER,0,&eq ); } -} - static void eqVScaleChanged (GtkRange *range, gpointer user_data) { (void) range;

1 0

r38627 - trunk/gui/dialog/equalizer.c
by ib 25 Jun '24

25 Jun '24

Author: ib Date: Tue Jun 25 15:22:38 2024 New Revision: 38627 Log: Do not select row 0 (all channels) after creating the channel name list. This will trigger eqSelectChannelsListRow(), which will then overwrite all channels with channel0 data, resulting in the loss of the settings the user had for the channels. This should only happen if the user intentionally selects row 0. Modified: trunk/gui/dialog/equalizer.c Modified: trunk/gui/dialog/equalizer.c ============================================================================== --- trunk/gui/dialog/equalizer.c Tue Jun 25 15:21:11 2024 (r38626) +++ trunk/gui/dialog/equalizer.c Tue Jun 25 15:22:38 2024 (r38627) @@ -113,7 +113,6 @@ static void eqSetChannelNames( void ) str[0]=gtkEquChannel5; gtk_clist_append( GTK_CLIST( ChannelsList ) ,str); str[0]=gtkEquChannel6; gtk_clist_append( GTK_CLIST( ChannelsList ) ,str); } - gtk_clist_select_row( GTK_CLIST( ChannelsList ),0,0 ); } static void eqHScaleChanged (GtkRange *range, gpointer user_data)

1 0

r38626 - trunk/gui/dialog/equalizer.c
by ib 25 Jun '24

25 Jun '24

Author: ib Date: Tue Jun 25 15:21:11 2024 New Revision: 38626 Log: Keep old gtkEquChannels value when canceling the equalizer dialog. Check its current value and reset it if necessary when canceling the dialog. Moreover, set its initial value when creating the dialog. Modified: trunk/gui/dialog/equalizer.c Modified: trunk/gui/dialog/equalizer.c ============================================================================== --- trunk/gui/dialog/equalizer.c Tue Jun 25 15:20:16 2024 (r38625) +++ trunk/gui/dialog/equalizer.c Tue Jun 25 15:21:11 2024 (r38626) @@ -61,6 +61,8 @@ static GtkAdjustment * A3125adj, * A125a static int Channel = -1; // the selected channel, or -1 (all channels) +static float old_gtkEquChannels[6][10]; + // --- char * gtkEquChannel1 = NULL; @@ -252,6 +254,23 @@ static gboolean eqDelete (GtkWidget *wid (void) event; (void) user_data; + if (memcmp(gtkEquChannels, old_gtkEquChannels, sizeof(gtkEquChannels)) != 0) + { + unsigned int i, j; + equalizer_t eq; + + memcpy(gtkEquChannels, old_gtkEquChannels, sizeof(gtkEquChannels)); + + for (i = 0; i < FF_ARRAY_ELEMS(gtkEquChannels); i++) + for (j = 0; j < FF_ARRAY_ELEMS(*gtkEquChannels); j++) + { + eq.channel = i; + eq.band = j; + eq.gain = gtkEquChannels[i][j]; + mplayer(MPLAYER_SET_EQUALIZER, 0, &eq); + } + } + mplayer(MPLAYER_SET_CONTRAST, vo_gamma_contrast, 0); mplayer(MPLAYER_SET_BRIGHTNESS, vo_gamma_brightness, 0); mplayer(MPLAYER_SET_HUE, vo_gamma_hue, 0); @@ -310,6 +329,8 @@ static GtkWidget * CreateEqualizer( void gtk_table_set_row_spacings( GTK_TABLE( table1 ),4 ); gtk_table_set_col_spacings( GTK_TABLE( table1 ),9 ); + memcpy(old_gtkEquChannels, gtkEquChannels, sizeof(gtkEquChannels)); + A3125adj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,-eqRange,eqRange,0.5,0,0 ) ); A3125=gtkAddVScale( A3125adj,NULL,-1 ); gtk_table_attach( GTK_TABLE( table1 ),A3125,0,1,0,1,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),0,0 ); @@ -350,6 +371,9 @@ static GtkWidget * CreateEqualizer( void A16000=gtkAddVScale( A16000adj,NULL,-1 ); gtk_table_attach( GTK_TABLE( table1 ),A16000,9,10,0,1,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),0,0 ); + Channel = -1; + eqSetBands(0); + gtk_table_attach( GTK_TABLE( table1 ), gtkAddLabel( _(MSGTR_GUI_Frequency0),NULL ), 0,1,1,2,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); @@ -508,9 +532,6 @@ void ShowEqualizer( void ) gtk_widget_set_sensitive(VHue, set); gtk_widget_set_sensitive(VSaturation, set); - Channel=-1; - eqSetBands( 0 ); - set = (guiInfo.Playing && gtkEnableAudioEqualizer); gtk_widget_set_sensitive(ChannelsList, set);

1 0