From 904cff75523dbc837bf45649ad9b51f1d063a796 Mon Sep 17 00:00:00 2001 From: pontscho Date: Sun, 12 Jan 2003 18:35:53 +0000 Subject: not needed. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8921 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Gui/cfg.c | 2 -- Gui/cfg.h | 1 - Gui/interface.c | 3 --- Gui/mplayer/gtk/opts.c | 11 ----------- 4 files changed, 17 deletions(-) (limited to 'Gui') diff --git a/Gui/cfg.c b/Gui/cfg.c index c5b5170bd3..210fc872b1 100644 --- a/Gui/cfg.c +++ b/Gui/cfg.c @@ -31,7 +31,6 @@ int gtkVopPP = 0; int gtkVopFAME = 0; #endif -int gtkAONoSound = 0; int gtkAONorm = 0; int gtkAOSurround = 0; int gtkAOExtraStereo = 0; @@ -96,7 +95,6 @@ static config_t gui_opts[] = #endif { "ao_driver",&audio_driver_list,CONF_TYPE_STRING_LIST,0,0,0,NULL }, - { "ao_nosound",>kAONoSound,CONF_TYPE_FLAG,0,0,1,NULL }, { "ao_volnorm",>kAONorm,CONF_TYPE_FLAG,0,0,1,NULL }, { "ao_surround",>kAOSurround,CONF_TYPE_FLAG,0,0,1,NULL }, { "ao_extra_stereo",>kAOExtraStereo,CONF_TYPE_FLAG,0,0,1,NULL }, diff --git a/Gui/cfg.h b/Gui/cfg.h index f551dbeca7..76e5e3bb38 100644 --- a/Gui/cfg.h +++ b/Gui/cfg.h @@ -8,7 +8,6 @@ extern int gtkVopPP; extern int gtkVopLAVC; extern int gtkVopFAME; -extern int gtkAONoSound; extern int gtkAONorm; extern int gtkAOFakeSurround; extern int gtkAOExtraStereo; diff --git a/Gui/interface.c b/Gui/interface.c index bd4e6356f8..b5adb07b44 100644 --- a/Gui/interface.c +++ b/Gui/interface.c @@ -567,9 +567,6 @@ int guiGetEvent( int type,char * arg ) btnModify( evSetBalance,guiIntfStruct.Balance ); } - if ( gtkAONoSound ) { if ( !muted ) mixer_mute(); } - else if ( muted ) mixer_mute(); - if ( gtkEnableAudioEqualizer ) { equalizer_t eq; diff --git a/Gui/mplayer/gtk/opts.c b/Gui/mplayer/gtk/opts.c index 914990c8e3..99210d6ae4 100644 --- a/Gui/mplayer/gtk/opts.c +++ b/Gui/mplayer/gtk/opts.c @@ -48,7 +48,6 @@ static GtkWidget * CBAFM; static GtkWidget * CBAudioEqualizer; //static GtkWidget * CBSurround; static GtkWidget * CBExtraStereo; -static GtkWidget * CBNoSound; static GtkWidget * CBNormalize; static GtkWidget * CBDoubleBuffer; static GtkWidget * CBDR; @@ -169,8 +168,6 @@ void ShowPreferences( void ) // -- 1. page gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBAudioEqualizer ),gtkEnableAudioEqualizer ); - gtkAONoSound=muted; - gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBNoSound ),gtkAONoSound ); #if 0 gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBSurround ),gtkAOSurround ); #endif @@ -370,7 +367,6 @@ void ShowPreferences( void ) gtk_signal_connect( GTK_OBJECT( CBExtraStereo ),"toggled",GTK_SIGNAL_FUNC( prToggled ),(void*)0 ); gtk_signal_connect( GTK_OBJECT( CBNormalize ),"toggled",GTK_SIGNAL_FUNC( prToggled ),(void*)1 ); gtk_signal_connect( GTK_OBJECT( CBAudioEqualizer ),"toggled",GTK_SIGNAL_FUNC( prToggled ),(void*)2 ); - gtk_signal_connect( GTK_OBJECT( CBNoSound ),"toggled",GTK_SIGNAL_FUNC( prToggled ),(void*)3 ); #ifdef HAVE_FREETYPE gtk_signal_connect( GTK_OBJECT( RBFontNoAutoScale ),"toggled",GTK_SIGNAL_FUNC( prToggled ),(void*)4 ); gtk_signal_connect( GTK_OBJECT( BRFontAutoScaleWidth ),"toggled",GTK_SIGNAL_FUNC( prToggled ),(void*)5 ); @@ -450,7 +446,6 @@ void prButton( GtkButton * button,gpointer user_data ) gtkEnableAudioEqualizer=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBAudioEqualizer ) ); gtkAOExtraStereo=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBExtraStereo ) ); gtkAONorm=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBNormalize ) ); - gtkAONoSound=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBNoSound ) ); gtkSet( gtkSetExtraStereo,HSExtraStereoMuladj->value,NULL ); audio_delay=HSAudioDelayadj->value; @@ -615,9 +610,6 @@ static void prToggled( GtkToggleButton * togglebutton,gpointer user_data ) // case 2: // equalizer // if ( guiIntfStruct.Playing ) gtkMessageBox( GTK_MB_WARNING,"Please remember, this function need restart the playing." ); // break; - case 3: // no sound - mixer_mute(); - break; case 4: case 5: case 6: @@ -750,8 +742,6 @@ GtkWidget * create_Preferences( void ) AddFrame( NULL,GTK_SHADOW_ETCHED_OUT,hbox1,1 ),1 ),0 ); gtk_widget_set_usize( vbox3,250,-2 ); - CBNoSound=AddCheckButton( MSGTR_PREFERENCES_DoNotPlaySound,vbox3 ); - AddHSeparator( vbox3 ); CBNormalize=AddCheckButton( MSGTR_PREFERENCES_NormalizeSound,vbox3 ); CBAudioEqualizer=AddCheckButton( MSGTR_PREFERENCES_EnEqualizer,vbox3 ); #if 0 @@ -1080,7 +1070,6 @@ GtkWidget * create_Preferences( void ) gtk_signal_connect( GTK_OBJECT( BLoadFont ),"clicked",GTK_SIGNAL_FUNC( prButton ),(void*)bLFont ); #if 0 - gtk_signal_connect( GTK_OBJECT( CBNoSound ),"toggled",GTK_SIGNAL_FUNC( on_CBNoSound_toggled ),NULL ); gtk_signal_connect( GTK_OBJECT( CBNormalize ),"toggled",GTK_SIGNAL_FUNC( on_CBNormalize_toggled ),NULL ); gtk_signal_connect( GTK_OBJECT( CBSurround ),"toggled",GTK_SIGNAL_FUNC( on_CBSurround_toggled ),NULL ); gtk_signal_connect( GTK_OBJECT( CBExtraStereo ),"toggled",GTK_SIGNAL_FUNC( on_CBExtraStereo_toggled ),NULL ); -- cgit v1.2.3