Mercurial > mplayer.hg

changeset 8886:d32accfed8e6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add osd_level=3 support
author pontscho
date Sat, 11 Jan 2003 09:20:36 +0000
parents 33fb8b6b8547
children ecc223413c2d
files Gui/cfg.c Gui/mplayer/gtk/opts.c help/help_mp-en.h
diffstat 3 files changed, 8 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/Gui/cfg.c	Sat Jan 11 05:06:48 2003 +0000
+++ b/Gui/cfg.c	Sat Jan 11 09:20:36 2003 +0000
@@ -109,7 +109,7 @@
  { "ao_sdl_subdriver",&gtkAOSDLDriver,CONF_TYPE_STRING,0,0,0,NULL },
 #endif
  
- { "osd_level",&osd_level,CONF_TYPE_INT,CONF_RANGE,0,2,NULL },
+ { "osd_level",&osd_level,CONF_TYPE_INT,CONF_RANGE,0,3,NULL },
  { "sub_auto_load",&sub_auto,CONF_TYPE_FLAG,0,0,1,NULL },
  { "sub_unicode",&sub_unicode,CONF_TYPE_FLAG,0,0,1,NULL },
  { "sub_pos",&sub_pos,CONF_TYPE_INT,CONF_RANGE,0,200,NULL },
--- a/Gui/mplayer/gtk/opts.c	Sat Jan 11 05:06:48 2003 +0000
+++ b/Gui/mplayer/gtk/opts.c	Sat Jan 11 09:20:36 2003 +0000
@@ -78,6 +78,7 @@
 static GtkWidget * RBOSDNone;
 static GtkWidget * RBOSDTandP;
 static GtkWidget * RBOSDIndicator;
+static GtkWidget * RBOSDTPTT;
 
 static GtkWidget * HSAudioDelay;
 static GtkWidget * HSExtraStereoMul;
@@ -259,6 +260,7 @@
    case 0: gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( RBOSDNone ),TRUE ); break;
    case 1: gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( RBOSDIndicator ),TRUE ); break;
    case 2: gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( RBOSDTandP ),TRUE ); break;
+   case 3: gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( RBOSDTPTT ),TRUE ); break;
   }
 #if 0
  if ( guiIntfStruct.Subtitlename ) gtk_entry_set_text( GTK_ENTRY( ESubtitleName ),guiIntfStruct.Subtitlename );
@@ -355,6 +357,7 @@
  gtk_widget_set_sensitive( RBOSDNone,FALSE );
  gtk_widget_set_sensitive( RBOSDTandP,FALSE );
  gtk_widget_set_sensitive( RBOSDIndicator,FALSE );
+ gtk_widget_set_sensitive( RBOSDTPTT,FALSE );
 #endif
 
 #if !defined( USE_OSD ) && !defined( USE_SUB )
@@ -477,6 +480,7 @@
 	if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( RBOSDNone ) ) ) osd_level=0;
 	if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( RBOSDIndicator ) ) ) osd_level=1;
 	if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( RBOSDTandP ) ) ) osd_level=2;
+	if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( RBOSDTPTT ) ) ) osd_level=3;
 
         // font ...	
 	guiSetFilename( font_name,gtk_entry_get_text( GTK_ENTRY( prEFontName ) ) );
@@ -826,6 +830,7 @@
   RBOSDNone=AddRadioButton( MSGTR_PREFERENCES_None,&OSD_group,vbox600 );
   RBOSDTandP=AddRadioButton( MSGTR_PREFERENCES_OSDTimer,&OSD_group,vbox600 );
   RBOSDIndicator=AddRadioButton( MSGTR_PREFERENCES_OSDProgress,&OSD_group,vbox600 );
+  RBOSDTPTT=AddRadioButton( MSGTR_PREFERENCES_OSDTimerPercentageTotalTime,&OSD_group,vbox600 );
 
   vbox7=AddVBox( 
     AddFrame( NULL,GTK_SHADOW_NONE,
@@ -1096,6 +1101,7 @@
   gtk_signal_connect( GTK_OBJECT( RBOSDNone ),"toggled",GTK_SIGNAL_FUNC( on_RBOSDNone_toggled ),NULL );
   gtk_signal_connect( GTK_OBJECT( RBOSDTandP ),"toggled",GTK_SIGNAL_FUNC( on_RBOSDTandP_toggled ),NULL );
   gtk_signal_connect( GTK_OBJECT( RBOSDIndicator ),"toggled",GTK_SIGNAL_FUNC( on_RBOSDIndicator_toggled ),NULL );
+  gtk_signal_connect( GTK_OBJECT( RBOSDTPTT ),"toggled",GTK_SIGNAL_FUNC( on_RBOSDIndicator_toggled ),NULL );
   gtk_signal_connect( GTK_OBJECT( CBAudioEqualizer ),"toggled",GTK_SIGNAL_FUNC( on_CBAudioEqualizer_toggled ),NULL );
 #endif
 #if 0
--- a/help/help_mp-en.h	Sat Jan 11 05:06:48 2003 +0000
+++ b/help/help_mp-en.h	Sat Jan 11 09:20:36 2003 +0000
@@ -434,6 +434,7 @@
 #define MSGTR_PREFERENCES_Panscan "Panscan: "
 #define MSGTR_PREFERENCES_OSDTimer "Timer and indicators"
 #define MSGTR_PREFERENCES_OSDProgress "Progressbars only"
+#define MSGTR_PREFERENCES_OSDTimerPercentageTotalTime "Timer, percentage and total time"
 #define MSGTR_PREFERENCES_Subtitle "Subtitle:"
 #define MSGTR_PREFERENCES_SUB_Delay "Delay: "
 #define MSGTR_PREFERENCES_SUB_FPS "FPS:"