# HG changeset patch # User ib # Date 1364519862 0 # Node ID 249207676edf397d06f4f1ca3599fe5cf13054ef # Parent 188b782b013f14b4dc6c7b266ef983ac2ead9092 Make create_Equalizer() static. It only has file scope. In order to do so, relocate some other static functions. diff -r 188b782b013f -r 249207676edf gui/dialog/equalizer.c --- a/gui/dialog/equalizer.c Fri Mar 29 01:14:44 2013 +0000 +++ b/gui/dialog/equalizer.c Fri Mar 29 01:17:42 2013 +0000 @@ -126,48 +126,6 @@ gtk_clist_select_row( GTK_CLIST( ChannelsList ),0,0 ); } -void ShowEqualizer( void ) -{ - if ( Equalizer ) gtkActive( Equalizer ); - else Equalizer=create_Equalizer(); - - if ( !gtkEquChannel1 ) gtkEquChannel1=strdup( MSGTR_EQU_Front_Right ); - if ( !gtkEquChannel2 ) gtkEquChannel2=strdup( MSGTR_EQU_Front_Left ); - if ( !gtkEquChannel3 ) gtkEquChannel3=strdup( MSGTR_EQU_Back_Right ); - if ( !gtkEquChannel4 ) gtkEquChannel4=strdup( MSGTR_EQU_Back_Left ); - if ( !gtkEquChannel5 ) gtkEquChannel5=strdup( MSGTR_EQU_Center ); - if ( !gtkEquChannel6 ) gtkEquChannel6=strdup( MSGTR_EQU_Bass ); - - eqSetChannelNames(); - - if ( !guiInfo.Playing || !guiInfo.sh_video ) - { - gtk_widget_set_sensitive( VContrast,FALSE ); - gtk_widget_set_sensitive( VBrightness,FALSE ); - gtk_widget_set_sensitive( VHue,FALSE ); - gtk_widget_set_sensitive( VSaturation,FALSE ); - } - Channel=-1; - eqSetBands( 0 ); - if ( !guiInfo.Playing || !gtkEnableAudioEqualizer ) - { - gtk_widget_set_sensitive( ChannelsList,FALSE ); - gtk_widget_set_sensitive( A3125,FALSE ); - gtk_widget_set_sensitive( A125,FALSE ); - gtk_widget_set_sensitive( A6250,FALSE ); - gtk_widget_set_sensitive( A250,FALSE ); - gtk_widget_set_sensitive( A500,FALSE ); - gtk_widget_set_sensitive( A1000,FALSE ); - gtk_widget_set_sensitive( A2000,FALSE ); - gtk_widget_set_sensitive( A4000,FALSE ); - gtk_widget_set_sensitive( A8000,FALSE ); - gtk_widget_set_sensitive( A16000,FALSE ); - } - - if ( gtk_notebook_get_current_page( GTK_NOTEBOOK( Notebook ) ) == 0 ) gtk_widget_show( Config ); - gtk_widget_show( Equalizer ); -} - static void HideEqualizer( void ) { if ( !Equalizer ) return; @@ -274,7 +232,7 @@ else gtk_widget_show( Config ); } -GtkWidget * create_Equalizer( void ) +static GtkWidget * create_Equalizer( void ) { GtkWidget * vbox1; GtkWidget * hbox1; @@ -500,6 +458,48 @@ return Equalizer; } +void ShowEqualizer( void ) +{ + if ( Equalizer ) gtkActive( Equalizer ); + else Equalizer=create_Equalizer(); + + if ( !gtkEquChannel1 ) gtkEquChannel1=strdup( MSGTR_EQU_Front_Right ); + if ( !gtkEquChannel2 ) gtkEquChannel2=strdup( MSGTR_EQU_Front_Left ); + if ( !gtkEquChannel3 ) gtkEquChannel3=strdup( MSGTR_EQU_Back_Right ); + if ( !gtkEquChannel4 ) gtkEquChannel4=strdup( MSGTR_EQU_Back_Left ); + if ( !gtkEquChannel5 ) gtkEquChannel5=strdup( MSGTR_EQU_Center ); + if ( !gtkEquChannel6 ) gtkEquChannel6=strdup( MSGTR_EQU_Bass ); + + eqSetChannelNames(); + + if ( !guiInfo.Playing || !guiInfo.sh_video ) + { + gtk_widget_set_sensitive( VContrast,FALSE ); + gtk_widget_set_sensitive( VBrightness,FALSE ); + gtk_widget_set_sensitive( VHue,FALSE ); + gtk_widget_set_sensitive( VSaturation,FALSE ); + } + Channel=-1; + eqSetBands( 0 ); + if ( !guiInfo.Playing || !gtkEnableAudioEqualizer ) + { + gtk_widget_set_sensitive( ChannelsList,FALSE ); + gtk_widget_set_sensitive( A3125,FALSE ); + gtk_widget_set_sensitive( A125,FALSE ); + gtk_widget_set_sensitive( A6250,FALSE ); + gtk_widget_set_sensitive( A250,FALSE ); + gtk_widget_set_sensitive( A500,FALSE ); + gtk_widget_set_sensitive( A1000,FALSE ); + gtk_widget_set_sensitive( A2000,FALSE ); + gtk_widget_set_sensitive( A4000,FALSE ); + gtk_widget_set_sensitive( A8000,FALSE ); + gtk_widget_set_sensitive( A16000,FALSE ); + } + + if ( gtk_notebook_get_current_page( GTK_NOTEBOOK( Notebook ) ) == 0 ) gtk_widget_show( Config ); + gtk_widget_show( Equalizer ); +} + /* equalizer config dialog box */ static GtkWidget * CBChannel1; diff -r 188b782b013f -r 249207676edf gui/dialog/equalizer.h --- a/gui/dialog/equalizer.h Fri Mar 29 01:14:44 2013 +0000 +++ b/gui/dialog/equalizer.h Fri Mar 29 01:17:42 2013 +0000 @@ -23,7 +23,6 @@ extern GtkWidget * Equalizer; -GtkWidget * create_Equalizer( void ); void ShowEqualizer( void ); #endif /* MPLAYER_GUI_EQUALIZER_H */