From a5593ee1129a20cc581db1200e85ab822f8eb4f9 Mon Sep 17 00:00:00 2001 From: pontscho Date: Thu, 28 Nov 2002 21:34:14 +0000 Subject: [PATCH] add stop_xscreensaver git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8309 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Gui/cfg.c | 2 ++ Gui/mplayer/gtk/opts.c | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/Gui/cfg.c b/Gui/cfg.c index 55ff8565d3..3b5bf894e4 100644 --- a/Gui/cfg.c +++ b/Gui/cfg.c @@ -56,6 +56,7 @@ int gtkLoadFullscreen = 0; 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 @@ static config_t gui_opts[] = { "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 --git a/Gui/mplayer/gtk/opts.c b/Gui/mplayer/gtk/opts.c index 7c13e671fc..3f7a7c47c8 100644 --- a/Gui/mplayer/gtk/opts.c +++ b/Gui/mplayer/gtk/opts.c @@ -65,6 +65,7 @@ static GtkWidget * CBDumpSrt; static GtkWidget * CBPostprocess; static GtkWidget * CBCache; static GtkWidget * CBLoadFullscreen; +static GtkWidget * CBStopXScreenSaver; static GtkWidget * SBCache; static GtkAdjustment * SBCacheadj; @@ -149,6 +150,7 @@ static void prEntry( GtkContainer * container,GtkWidget * widget,gpointer user_d #endif extern int muted; +extern int stop_xscreensaver; void ShowPreferences( void ) { @@ -277,6 +279,7 @@ void ShowPreferences( void ) 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 @@ void prButton( GtkButton * button,gpointer user_data ) 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 @@ GtkWidget * create_Preferences( void ) 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 );