[MPlayer-cvslog] r33565 - in trunk: gui/cfg.c gui/mplayer/gtk/opts.c help/help_mp-de.h help/help_mp-en.h

[ib]

Author: ib
Date: Mon Jun  6 16:08:18 2011
New Revision: 33565

Log:
Add option '-idle' to the GUI configuration file.

Also, add a check button for it to the preferences menu.

Modified:
   trunk/gui/cfg.c
   trunk/gui/mplayer/gtk/opts.c

Changes in other areas also in this revision:
Modified:
   trunk/help/help_mp-de.h
   trunk/help/help_mp-en.h

Modified: trunk/gui/cfg.c
==============================================================================
--- trunk/gui/cfg.c	Mon Jun  6 13:55:35 2011	(r33564)
+++ trunk/gui/cfg.c	Mon Jun  6 16:08:18 2011	(r33565)
@@ -164,6 +164,8 @@ static const m_option_t gui_opts[] = {
     { "gui_video_out_pos_x",         &gui_sub_pos_x,           CONF_TYPE_INT,         0,          0,     0,       NULL },
     { "gui_video_out_pos_y",         &gui_sub_pos_y,           CONF_TYPE_INT,         0,          0,     0,       NULL },
 
+    { "idle",                        &player_idle_mode,        CONF_TYPE_FLAG,        CONF_GLOBAL, 0,     1,       NULL },
+
     // NOTE TO MYSELF: Do we really need all/any non-gtkOptions, i.e. override mplayer options?
 
     { "gui_skin",                    &skinName,                CONF_TYPE_STRING,      0,          0,     0,       NULL },

Modified: trunk/gui/mplayer/gtk/opts.c
==============================================================================
--- trunk/gui/mplayer/gtk/opts.c	Mon Jun  6 13:55:35 2011	(r33564)
+++ trunk/gui/mplayer/gtk/opts.c	Mon Jun  6 16:08:18 2011	(r33565)
@@ -101,6 +101,7 @@ static GtkWidget * CBLoadFullscreen;
 static GtkWidget * CBSaveWinPos;
 static GtkWidget * CBStopXScreenSaver;
 static GtkWidget * CBPlayBar;
+static GtkWidget * CBNoIdle;
 
 static GtkWidget * SBCache;
 static GtkAdjustment * SBCacheadj;
@@ -406,6 +407,7 @@ void ShowPreferences( void )
    gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBPlayBar ),0 );
    gtk_widget_set_sensitive( CBPlayBar,FALSE );
   }
+ gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBNoIdle ),!player_idle_mode );
 
  gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBCache ),0 );
  gtk_adjustment_set_value( SBCacheadj,(float)gtkCacheSize );
@@ -623,6 +625,7 @@ static void prButton( GtkButton * button
 	gtkShowVideoWindow=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBShowVideoWindow ) );
 	stop_xscreensaver=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBStopXScreenSaver ) );
 	gtkEnablePlayBar=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBPlayBar ) );
+	player_idle_mode=!gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBNoIdle ) );
 	gtkSet( gtkSetAutoq,HSPPQualityadj->value,NULL );
 
 	if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBCache ) ) ) { gtkCacheSize=(int)SBCacheadj->value; gtkCacheOn=1; }
@@ -1273,6 +1276,7 @@ GtkWidget * create_Preferences( void )
   CBSaveWinPos=AddCheckButton( MSGTR_PREFERENCES_SaveWinPos,vbox602 );
   CBStopXScreenSaver=AddCheckButton( MSGTR_PREFERENCES_XSCREENSAVER,vbox602 );
   CBPlayBar=AddCheckButton( MSGTR_PREFERENCES_PlayBar,vbox602 );
+  CBNoIdle=AddCheckButton( MSGTR_PREFERENCES_NoIdle,vbox602 );
 
   AddHSeparator( vbox602 );