Mercurial > mplayer.hg

comparison gui/dialog/preferences.c @ 36003:8fea01665c83

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove HidePreferences(), HideAudioConfig() and HideDXR3Config(). Simply destroy the windows. (It's pointless to check whether the window is existing, because it cannot be called without an existing window.) In order to do so, relocate definition of AudioConfig. Additionally, remove unnecessary declarations.
author ib
date Fri, 29 Mar 2013 17:28:44 +0000
parents 6c891a0e3fea
children d154d0035cb0
comparison
equal deleted inserted replaced
36002:6fc16dfa49d6 36003:8fea01665c83
184 static int old_audio_driver = 0; 184 static int old_audio_driver = 0;
185 static char * ao_driver[3]; 185 static char * ao_driver[3];
186 static char * vo_driver[3]; 186 static char * vo_driver[3];
187 static int old_video_driver = 0; 187 static int old_video_driver = 0;
188 188
189 static GtkWidget *AudioConfig;
190
189 void ShowDXR3Config( void ); 191 void ShowDXR3Config( void );
190 void HideDXR3Config( void );
191 void ShowAudioConfig( void ); 192 void ShowAudioConfig( void );
192 void HideAudioConfig( void );
193 193
194 static gboolean prHScaler( GtkWidget * widget,GdkEvent * event,gpointer user_data ); 194 static gboolean prHScaler( GtkWidget * widget,GdkEvent * event,gpointer user_data );
195 static void prToggled( GtkToggleButton * togglebutton,gpointer user_data ); 195 static void prToggled( GtkToggleButton * togglebutton,gpointer user_data );
196 static void prCListRow( GtkCList * clist,gint row,gint column,GdkEvent * event,gpointer user_data ); 196 static void prCListRow( GtkCList * clist,gint row,gint column,GdkEvent * event,gpointer user_data );
197 #if defined(CONFIG_FREETYPE) || defined(CONFIG_ICONV) 197 #if defined(CONFIG_FREETYPE) || defined(CONFIG_ICONV)
198 static void prEntry( GtkEditable * editable,gpointer user_data ); 198 static void prEntry( GtkEditable * editable,gpointer user_data );
199 #endif 199 #endif
200
201 static void HidePreferences( void )
202 {
203 if ( !Preferences ) return;
204 gtk_widget_hide( Preferences );
205 gtk_widget_destroy( Preferences );
206 Preferences=NULL;
207 HideAudioConfig();
208 #ifdef CONFIG_DXR3
209 HideDXR3Config();
210 #endif
211 }
212 200
213 #if defined(CONFIG_FREETYPE) || defined(CONFIG_ICONV) 201 #if defined(CONFIG_FREETYPE) || defined(CONFIG_ICONV)
214 static void prEntry( GtkEditable * editable,gpointer user_data ) 202 static void prEntry( GtkEditable * editable,gpointer user_data )
215 { 203 {
216 const char * comment; 204 const char * comment;
350 338
351 setdup( &dvd_device,gtk_entry_get_text( GTK_ENTRY( prEDVDDevice ) ) ); 339 setdup( &dvd_device,gtk_entry_get_text( GTK_ENTRY( prEDVDDevice ) ) );
352 setdup( &cdrom_device,gtk_entry_get_text( GTK_ENTRY( prECDRomDevice ) ) ); 340 setdup( &cdrom_device,gtk_entry_get_text( GTK_ENTRY( prECDRomDevice ) ) );
353 341
354 case bCancel: 342 case bCancel:
355 HidePreferences(); 343 gtk_widget_destroy( Preferences );
344 Preferences=NULL;
345 if ( AudioConfig )
346 {
347 gtk_widget_destroy( AudioConfig );
348 AudioConfig=NULL;
349 }
350 #ifdef CONFIG_DXR3
351 if ( DXR3Config )
352 {
353 gtk_widget_destroy( DXR3Config );
354 DXR3Config=NULL;
355 }
356 #endif
356 break; 357 break;
357 case bAConfig: 358 case bAConfig:
358 if ( !ao_driver[0] ) break; 359 if ( !ao_driver[0] ) break;
359 gtk_widget_set_sensitive( AConfig,FALSE ); 360 gtk_widget_set_sensitive( AConfig,FALSE );
360 if ( !strncmp( ao_driver[0],"oss",3 ) || 361 if ( !strncmp( ao_driver[0],"oss",3 ) ||
1495 } 1496 }
1496 gtk_entry_set_text(GTK_ENTRY(dest),to); 1497 gtk_entry_set_text(GTK_ENTRY(dest),to);
1497 } 1498 }
1498 #endif 1499 #endif
1499 1500
1500 static GtkWidget *AudioConfig;
1501 static GtkWidget *CEAudioDevice; 1501 static GtkWidget *CEAudioDevice;
1502 static GtkWidget *CBAudioDevice; 1502 static GtkWidget *CBAudioDevice;
1503 static GtkWidget *CEAudioMixer; 1503 static GtkWidget *CEAudioMixer;
1504 static GtkWidget *CBAudioMixer; 1504 static GtkWidget *CBAudioMixer;
1505 static GtkWidget *CEAudioMixerChannel; 1505 static GtkWidget *CEAudioMixerChannel;
1506 static GtkWidget *CBAudioMixerChannel; 1506 static GtkWidget *CBAudioMixerChannel;
1507 static GtkWidget *BAudioOk; 1507 static GtkWidget *BAudioOk;
1508 static GtkWidget *BAudioCancel; 1508 static GtkWidget *BAudioCancel;
1509
1510 void HideAudioConfig( void ) {
1511 if (!AudioConfig) return;
1512 gtk_widget_hide(AudioConfig);
1513 gtk_widget_destroy(AudioConfig);
1514 AudioConfig=NULL;
1515 }
1516 1509
1517 static void audioButton(GtkButton *button, gpointer user_data) { 1510 static void audioButton(GtkButton *button, gpointer user_data) {
1518 switch( (int)user_data ) { 1511 switch( (int)user_data ) {
1519 case 1: 1512 case 1:
1520 #ifdef CONFIG_OSS_AUDIO 1513 #ifdef CONFIG_OSS_AUDIO
1548 nfree(gtkAOESDDevice); 1541 nfree(gtkAOESDDevice);
1549 gtkAOESDDevice = gstrdup(getGtkEntryText(CEAudioDevice)); 1542 gtkAOESDDevice = gstrdup(getGtkEntryText(CEAudioDevice));
1550 } 1543 }
1551 #endif 1544 #endif
1552 case 0: 1545 case 0:
1553 HideAudioConfig(); 1546 gtk_widget_destroy(AudioConfig);
1547 AudioConfig=NULL;
1554 break; 1548 break;
1555 } 1549 }
1556 } 1550 }
1557 1551
1558 static GtkWidget *CreateAudioConfig( void ) { 1552 static GtkWidget *CreateAudioConfig( void ) {
1732 1726
1733 gtk_widget_show( DXR3Config ); 1727 gtk_widget_show( DXR3Config );
1734 gtkSetLayer( DXR3Config ); 1728 gtkSetLayer( DXR3Config );
1735 } 1729 }
1736 1730
1737 void HideDXR3Config( void )
1738 {
1739 if ( !DXR3Config ) return;
1740 gtk_widget_hide( DXR3Config );
1741 gtk_widget_destroy( DXR3Config );
1742 DXR3Config=NULL;
1743 }
1744
1745 static void dxr3Button( GtkButton * button,gpointer user_data ) 1731 static void dxr3Button( GtkButton * button,gpointer user_data )
1746 { 1732 {
1747 switch ( (int)user_data ) 1733 switch ( (int)user_data )
1748 { 1734 {
1749 case 0: // Ok 1735 case 0: // Ok
1750 nfree( gtkDXR3Device ); gtkDXR3Device=strdup( gtk_entry_get_text( GTK_ENTRY( CEDXR3Device ) ) ); 1736 nfree( gtkDXR3Device ); gtkDXR3Device=strdup( gtk_entry_get_text( GTK_ENTRY( CEDXR3Device ) ) );
1751 gtkVfLAVC=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( RBVLavc ) ); 1737 gtkVfLAVC=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( RBVLavc ) );
1752 case 1: // Cancel 1738 case 1: // Cancel
1753 HideDXR3Config(); 1739 gtk_widget_destroy( DXR3Config );
1740 DXR3Config=NULL;
1754 break; 1741 break;
1755 } 1742 }
1756 } 1743 }
1757 1744
1758 GtkWidget * CreateDXR3Config( void ) 1745 GtkWidget * CreateDXR3Config( void )