[MPlayer-cvslog] r36096 - trunk/gui/dialog/equalizer.c

[ib]

Author: ib
Date: Fri Mar 29 18:23:47 2013
New Revision: 36096

Log:
Remove HideEqualizer() and HideEquConfig().

Simply destroy the windows.

(It's pointless to check whether the window is existing,
because it cannot be called without an existing window.)

Modified:
   trunk/gui/dialog/equalizer.c

Modified: trunk/gui/dialog/equalizer.c
==============================================================================
--- trunk/gui/dialog/equalizer.c	Fri Mar 29 18:21:31 2013	(r36095)
+++ trunk/gui/dialog/equalizer.c	Fri Mar 29 18:23:47 2013	(r36096)
@@ -125,23 +125,6 @@ static void eqSetChannelNames( void )
  gtk_clist_select_row( GTK_CLIST( ChannelsList ),0,0 );
 }
 
-static void HideEquConfig( void )
-{
- if ( !EquConfig ) return;
- gtk_widget_hide( EquConfig );
- gtk_widget_destroy( EquConfig );
- EquConfig=NULL;
-}
-
-static void HideEqualizer( void )
-{
- if ( !Equalizer ) return;
- gtk_widget_hide( Equalizer );
- gtk_widget_destroy( Equalizer );
- Equalizer=NULL;
- if ( EquConfig ) HideEquConfig();
-}
-
 static gboolean eqHScaleMotion( GtkWidget * widget,GdkEventMotion  * event,gpointer user_data )
 {
  equalizer_t eq;
@@ -189,7 +172,15 @@ static void eqButtonReleased( GtkButton 
 {
  switch( (int)user_data )
   {
-   case 0: HideEqualizer(); break;
+   case 0:
+        gtk_widget_destroy( Equalizer );
+        Equalizer=NULL;
+        if ( EquConfig )
+         {
+          gtk_widget_destroy( EquConfig );
+          EquConfig=NULL;
+         }
+        break;
    case 1:
 	if ( gtk_notebook_get_current_page( GTK_NOTEBOOK( Notebook ) ) == 0 )
 	 {
@@ -572,7 +563,8 @@ static void ecButtonReleased( GtkButton 
   nfree( gtkEquChannel6 ); gtkEquChannel6=gstrdup( gtk_entry_get_text( GTK_ENTRY( CEChannel6 ) ) );
   eqSetChannelNames();
  }
- HideEquConfig();
+ gtk_widget_destroy( EquConfig );
+ EquConfig=NULL;
 }
 
 GtkWidget * CreateEquConfig( void )