diff options
| author | pontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-01-11 09:20:36 +0000 |
|---|---|---|
| committer | pontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-01-11 09:20:36 +0000 |
| commit | 3b94bba292832f9f6b0f09262cfe0251914ea19c (patch) | |
| tree | 5f09a5c129f4f53375e68310679371ab1bfca797 /Gui | |
| parent | f6ffd63f4b8243f0c15908858381570f72f8d10f (diff) | |
| download | mpv-3b94bba292832f9f6b0f09262cfe0251914ea19c.tar.bz2 mpv-3b94bba292832f9f6b0f09262cfe0251914ea19c.tar.xz | |
add osd_level=3 support
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8887 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Gui')
| -rw-r--r-- | Gui/cfg.c | 2 | ||||
| -rw-r--r-- | Gui/mplayer/gtk/opts.c | 6 |
2 files changed, 7 insertions, 1 deletions
@@ -109,7 +109,7 @@ static config_t gui_opts[] = { "ao_sdl_subdriver",>kAOSDLDriver,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 }, diff --git a/Gui/mplayer/gtk/opts.c b/Gui/mplayer/gtk/opts.c index 1a78559f5c..914990c8e3 100644 --- a/Gui/mplayer/gtk/opts.c +++ b/Gui/mplayer/gtk/opts.c @@ -78,6 +78,7 @@ static GtkAdjustment * SBAutoSyncadj; static GtkWidget * RBOSDNone; static GtkWidget * RBOSDTandP; static GtkWidget * RBOSDIndicator; +static GtkWidget * RBOSDTPTT; static GtkWidget * HSAudioDelay; static GtkWidget * HSExtraStereoMul; @@ -259,6 +260,7 @@ void ShowPreferences( void ) 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 @@ void ShowPreferences( void ) 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 @@ void prButton( GtkButton * button,gpointer user_data ) 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 @@ GtkWidget * create_Preferences( void ) 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 @@ GtkWidget * create_Preferences( void ) 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 |