diff options
| author | pontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-10-16 15:35:28 +0000 |
|---|---|---|
| committer | pontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-10-16 15:35:28 +0000 |
| commit | bcc4c6b1ae5d13adcb385fc2fc8ee629eaa26d0c (patch) | |
| tree | e7ad43c99790b2039a4b5bea8a6e2eb55df9d737 /Gui/mplayer | |
| parent | 1413b42ad56a24ed12631fb43ccd7d44c05ac6a8 (diff) | |
| download | mpv-bcc4c6b1ae5d13adcb385fc2fc8ee629eaa26d0c.tar.bz2 mpv-bcc4c6b1ae5d13adcb385fc2fc8ee629eaa26d0c.tar.xz | |
- dvd aspect changing bug - fixed
- if codec is not found -> sig11 - fixed
- pp autoq handling bug - fixed
- some warning - fixed
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7752 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Gui/mplayer')
| -rw-r--r-- | Gui/mplayer/gtk/opts.c | 7 | ||||
| -rw-r--r-- | Gui/mplayer/mw.h | 3 |
2 files changed, 8 insertions, 2 deletions
diff --git a/Gui/mplayer/gtk/opts.c b/Gui/mplayer/gtk/opts.c index 0f62de4a64..35f0592342 100644 --- a/Gui/mplayer/gtk/opts.c +++ b/Gui/mplayer/gtk/opts.c @@ -364,6 +364,7 @@ void ShowPreferences( void ) gtk_signal_connect( GTK_OBJECT( HSFontOSDScale ),"motion_notify_event",GTK_SIGNAL_FUNC( prHScaler ),(void*)9 ); gtk_signal_connect( GTK_OBJECT( EFontEncoding ),"changed",GTK_SIGNAL_FUNC( prEntry ),NULL ); #endif + gtk_signal_connect( GTK_OBJECT( HSPPQuality ),"motion_notify_event",GTK_SIGNAL_FUNC( prHScaler ),(void*)10 ); gtk_signal_connect( GTK_OBJECT( CLADrivers ),"select_row",GTK_SIGNAL_FUNC( prCListRow ),(void*)0 ); gtk_signal_connect( GTK_OBJECT( CLVDrivers ),"select_row",GTK_SIGNAL_FUNC( prCListRow ),(void*)1 ); @@ -557,6 +558,9 @@ static gboolean prHScaler( GtkWidget * widget,GdkEventMotion * event,gpointer u gtkSet( gtkSetFontOSDScale,HSFontOSDScaleadj->value,NULL ); break; #endif + case 10: // auto quality + gtkSet( gtkSetAutoq,HSPPQualityadj->value,NULL ); + break; } return FALSE; } @@ -1638,7 +1642,8 @@ GtkWidget * create_Preferences( void ) gtk_misc_set_alignment( GTK_MISC( label14 ),7.45058e-09,0.5 ); gtk_misc_set_padding( GTK_MISC( label14 ),4,0 ); - HSPPQualityadj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,0,100,0,0,0 ) ); + if ( guiIntfStruct.sh_video && guiIntfStruct.Playing ) HSPPQualityadj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,0,get_video_quality_max( guiIntfStruct.sh_video ),0,0,0 ) ); + else HSPPQualityadj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,0,100,0,0,0 ) ); HSPPQuality=gtk_hscale_new( HSPPQualityadj ); gtk_widget_set_name( HSPPQuality,"HSPPQuality" ); gtk_widget_ref( HSPPQuality ); diff --git a/Gui/mplayer/mw.h b/Gui/mplayer/mw.h index f3eff2b12e..f7098aea65 100644 --- a/Gui/mplayer/mw.h +++ b/Gui/mplayer/mw.h @@ -456,8 +456,9 @@ set_volume: case 1: default: movie_aspect=-1; } - guiIntfStruct.FilenameChanged=1; wsClearWindow( appMPlayer.subWindow ); + if ( guiIntfStruct.StreamType == STREAMTYPE_DVD ) goto play_dvd_2; + else guiIntfStruct.FilenameChanged=1; break; // --- timer events |