# HG changeset patch # User pontscho # Date 1038519254 0 # Node ID 6ea0feac9d42062fb4e9a1c2674f58f5290c771e # Parent ecfe54825314d792f8145354904c4edb77b21191 add stop_xscreensaver diff -r ecfe54825314 -r 6ea0feac9d42 Gui/cfg.c --- a/Gui/cfg.c Thu Nov 28 20:35:54 2002 +0000 +++ b/Gui/cfg.c Thu Nov 28 21:34:14 2002 +0000 @@ -56,6 +56,7 @@ extern char * get_path( char * filename ); extern int flip; extern int frame_dropping; +extern int stop_xscreensaver; static m_config_t * gui_conf; static config_t gui_opts[] = @@ -114,6 +115,7 @@ { "cache_size",>kCacheSize,CONF_TYPE_INT,CONF_RANGE,-1,65535,NULL }, { "load_fullscreen",>kLoadFullscreen,CONF_TYPE_FLAG,0,0,1,NULL }, + { "stopxscreensaver",&stop_xscreensaver,CONF_TYPE_FLAG,0,0,1,NULL }, { "gui_skin",&skinName,CONF_TYPE_STRING,0,0,0,NULL }, diff -r ecfe54825314 -r 6ea0feac9d42 Gui/mplayer/gtk/opts.c --- a/Gui/mplayer/gtk/opts.c Thu Nov 28 20:35:54 2002 +0000 +++ b/Gui/mplayer/gtk/opts.c Thu Nov 28 21:34:14 2002 +0000 @@ -65,6 +65,7 @@ static GtkWidget * CBPostprocess; static GtkWidget * CBCache; static GtkWidget * CBLoadFullscreen; +static GtkWidget * CBStopXScreenSaver; static GtkWidget * SBCache; static GtkAdjustment * SBCacheadj; @@ -149,6 +150,7 @@ #endif extern int muted; +extern int stop_xscreensaver; void ShowPreferences( void ) { @@ -277,6 +279,7 @@ gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBIndex ),index_mode ); gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBPostprocess ),gtkVopPP ); gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBLoadFullscreen ),gtkLoadFullscreen ); + gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBStopXScreenSaver ),stop_xscreensaver ); gtk_adjustment_set_value( HSPPQualityadj,auto_quality ); { int i; @@ -469,6 +472,7 @@ index_mode=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBIndex ) ); gtkVopPP=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBPostprocess ) ); gtkLoadFullscreen=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBLoadFullscreen ) ); + stop_xscreensaver=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBStopXScreenSaver ) ); gtkSet( gtkSetAutoq,HSPPQualityadj->value,NULL ); if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBCache ) ) ) { gtkCacheSize=(int)SBCacheadj->value; gtkCacheOn=1; } @@ -994,6 +998,7 @@ AddFrame( MSGTR_PREFERENCES_FRAME_Misc,GTK_SHADOW_ETCHED_OUT,vbox601,0 ),1 ),0 ); CBLoadFullscreen=AddCheckButton( MSGTR_PREFERENCES_LoadFullscreen,vbox602 ); + CBStopXScreenSaver=AddCheckButton( MSGTR_PREFERENCES_XSREENSAVER,vbox602 ); label=AddLabel( MSGTR_PREFERENCES_Misc,NULL ); gtk_notebook_set_tab_label( GTK_NOTEBOOK( notebook1 ),gtk_notebook_get_nth_page( GTK_NOTEBOOK( notebook1 ),3 ),label );