November 2002 - MPlayer-cvslog - lists.mplayerhq.hu

CVS: main/Gui/mplayer/gtk opts.c,1.36,1.37
by Zoltan Ponekker 28 Nov '02

28 Nov '02

Update of /cvsroot/mplayer/main/Gui/mplayer/gtk In directory mail:/var/tmp.root/cvs-serv15309/Gui/mplayer/gtk Modified Files: opts.c Log Message: add autosync && some 10l bugfix Index: opts.c =================================================================== RCS file: /cvsroot/mplayer/main/Gui/mplayer/gtk/opts.c,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- opts.c 28 Nov 2002 21:34:14 -0000 1.36 +++ opts.c 28 Nov 2002 23:17:12 -0000 1.37 @@ -70,6 +70,10 @@ static GtkWidget * SBCache; static GtkAdjustment * SBCacheadj; +static GtkWidget * CBAutoSync; +static GtkWidget * SBAutoSync; +static GtkAdjustment * SBAutoSyncadj; + static GtkWidget * RBOSDNone; static GtkWidget * RBOSDTandP; static GtkWidget * RBOSDIndicator; @@ -316,7 +320,12 @@ gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBCache ),0 ); gtk_adjustment_set_value( SBCacheadj,(float)gtkCacheSize ); if ( !gtkCacheOn ) gtk_widget_set_sensitive( SBCache,FALSE ); - else gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBCache ),1 ); + else gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBCache ),TRUE ); + + gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBAutoSync ),0 ); + gtk_adjustment_set_value( SBAutoSyncadj,(float)gtkAutoSync ); + if ( !gtkAutoSyncOn ) gtk_widget_set_sensitive( SBAutoSync,FALSE ); + else gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBAutoSync ),TRUE ); // -- disables #ifndef USE_SUB @@ -354,6 +363,7 @@ gtk_signal_connect( GTK_OBJECT( RBFontAutoScaleDiagonal ),"toggled",GTK_SIGNAL_FUNC( prToggled ),(void*)7 ); #endif gtk_signal_connect( GTK_OBJECT( CBCache ),"toggled",GTK_SIGNAL_FUNC( prToggled ),(void*)8); + gtk_signal_connect( GTK_OBJECT( CBAutoSync ),"toggled",GTK_SIGNAL_FUNC( prToggled ),(void*)9); gtk_signal_connect( GTK_OBJECT( HSExtraStereoMul ),"motion_notify_event",GTK_SIGNAL_FUNC( prHScaler ),(void*)0 ); gtk_signal_connect( GTK_OBJECT( HSAudioDelay ),"motion_notify_event",GTK_SIGNAL_FUNC( prHScaler ),(void*)1 ); @@ -477,6 +487,9 @@ if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBCache ) ) ) { gtkCacheSize=(int)SBCacheadj->value; gtkCacheOn=1; } else gtkCacheOn=0; + + if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBAutoSync ) ) ) { gtkAutoSync=(int)SBAutoSyncadj->value; gtkAutoSyncOn=1; } + else gtkAutoSyncOn=0; { int i; @@ -592,6 +605,10 @@ if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBCache ) ) ) gtk_widget_set_sensitive( SBCache,TRUE ); else gtk_widget_set_sensitive( SBCache,FALSE ); break; + case 9: + if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBAutoSync ) ) ) gtk_widget_set_sensitive( SBAutoSync,TRUE ); + else gtk_widget_set_sensitive( SBAutoSync,FALSE ); + break; } } @@ -763,7 +780,6 @@ gtk_widget_set_usize( vbox5,250,-2 ); CBDoubleBuffer=AddCheckButton( MSGTR_PREFERENCES_DoubleBuffer,vbox5 ); -// gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBDoubleBuffer ),TRUE ); CBDR=AddCheckButton( MSGTR_PREFERENCES_DirectRender,vbox5 ); CBFramedrop=AddCheckButton( MSGTR_PREFERENCES_FrameDrop,vbox5 ); CBHFramedrop=AddCheckButton( MSGTR_PREFERENCES_HFrameDrop,vbox5 ); @@ -998,7 +1014,17 @@ 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 ); + CBStopXScreenSaver=AddCheckButton( MSGTR_PREFERENCES_XSCREENSAVER,vbox602 ); + + AddHSeparator( vbox602 ); + + CBAutoSync=AddCheckButton( MSGTR_PREFERENCES_AutoSync,vbox602 ); + hbox5=AddHBox( vbox602,1 ); + AddLabel( MSGTR_PREFERENCES_AutoSyncValue,hbox5 ); + SBAutoSyncadj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,0,10000,1,10,10 ) ); + SBAutoSync=gtk_spin_button_new( GTK_ADJUSTMENT( SBAutoSyncadj ),1,0 ); + gtk_widget_show( SBAutoSync ); + gtk_box_pack_start( GTK_BOX( hbox5 ),SBAutoSync,TRUE,TRUE,0 ); label=AddLabel( MSGTR_PREFERENCES_Misc,NULL ); gtk_notebook_set_tab_label( GTK_NOTEBOOK( notebook1 ),gtk_notebook_get_nth_page( GTK_NOTEBOOK( notebook1 ),3 ),label );

1 0

CVS: main/loader/dmo .cvsignore,NONE,1.1
by Diego Biurrun CVS 28 Nov '02

28 Nov '02

Update of /cvsroot/mplayer/main/loader/dmo In directory mail:/var/tmp.root/cvs-serv13611/loader/dmo Added Files: .cvsignore Log Message: .depend should be ignored. --- NEW FILE --- .depend

1 0

CVS: main/Gui/mplayer/gtk opts.c,1.35,1.36
by Zoltan Ponekker 28 Nov '02

28 Nov '02

Update of /cvsroot/mplayer/main/Gui/mplayer/gtk In directory mail:/var/tmp.root/cvs-serv28081/mplayer/gtk Modified Files: opts.c Log Message: add stop_xscreensaver Index: opts.c =================================================================== RCS file: /cvsroot/mplayer/main/Gui/mplayer/gtk/opts.c,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- opts.c 27 Nov 2002 22:48:56 -0000 1.35 +++ opts.c 28 Nov 2002 21:34:14 -0000 1.36 @@ -65,6 +65,7 @@ static GtkWidget * CBPostprocess; static GtkWidget * CBCache; static GtkWidget * CBLoadFullscreen; +static GtkWidget * CBStopXScreenSaver; static GtkWidget * SBCache; static GtkAdjustment * SBCacheadj; @@ -149,6 +150,7 @@ #endif extern int muted; +extern int stop_xscreensaver; void ShowPreferences( void ) { @@ -277,6 +279,7 @@ 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 @@ 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 @@ 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 );

1 0

CVS: main/Gui cfg.c,1.22,1.23
by Zoltan Ponekker 28 Nov '02

28 Nov '02

Update of /cvsroot/mplayer/main/Gui In directory mail:/var/tmp.root/cvs-serv28081 Modified Files: cfg.c Log Message: add stop_xscreensaver Index: cfg.c =================================================================== RCS file: /cvsroot/mplayer/main/Gui/cfg.c,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- cfg.c 25 Nov 2002 18:18:43 -0000 1.22 +++ cfg.c 28 Nov 2002 21:33:59 -0000 1.23 @@ -56,6 +56,7 @@ 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 @@ { "cache_size",&gtkCacheSize,CONF_TYPE_INT,CONF_RANGE,-1,65535,NULL }, { "load_fullscreen",&gtkLoadFullscreen,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 },

1 0

CVS: main/Gui/mplayer mw.c,1.93,1.94
by Zoltan Ponekker 28 Nov '02

28 Nov '02

Update of /cvsroot/mplayer/main/Gui/mplayer In directory mail:/var/tmp.root/cvs-serv13186/Gui/mplayer Modified Files: mw.c Log Message: - add Rüdiger Kuhlmann's <mplayer-list-UGa6JdjLujS2(a)ruediger-kuhlmann.de> patch - fix one 10l bug Index: mw.c =================================================================== RCS file: /cvsroot/mplayer/main/Gui/mplayer/mw.c,v retrieving revision 1.93 retrieving revision 1.94 diff -u -r1.93 -r1.94 --- mw.c 28 Nov 2002 00:44:24 -0000 1.93 +++ mw.c 28 Nov 2002 19:01:45 -0000 1.94 @@ -21,6 +21,11 @@ #include "../../libvo/sub.h" #include "../../mplayer.h" +#include "../../libmpdemux/demuxer.h" +#include "../../libmpdemux/stheader.h" +#include "../../codec-cfg.h" + + #include "play.h" #include "widgets.h" @@ -118,6 +123,10 @@ case 'b': sprintf( tmp,"%3.2f%%",guiIntfStruct.Balance ); strcat( trbuf,tmp ); break; case 'B': sprintf( tmp,"%3.1f",guiIntfStruct.Balance ); strcat( trbuf,tmp ); break; case 'd': sprintf( tmp,"%d",guiIntfStruct.FrameDrop ); strcat( trbuf,tmp ); break; + case 'x': sprintf( tmp,"%d",guiIntfStruct.MovieWidth ); strcat( trbuf,tmp ); break; + case 'y': sprintf( tmp,"%d",guiIntfStruct.MovieHeight ); strcat( trbuf,tmp ); break; + case 'C': sprintf( tmp,"%s", guiIntfStruct.sh_video? ((sh_video_t *)guiIntfStruct.sh_video)->codec->name : ""); + strcat( trbuf,tmp ); break; case 's': if ( guiIntfStruct.Playing == 0 ) strcat( trbuf,"s" ); break; case 'l': if ( guiIntfStruct.Playing == 1 ) strcat( trbuf,"p" ); break; case 'e': if ( guiIntfStruct.Playing == 2 ) strcat( trbuf,"e" ); break;

1 0

CVS: main mplayer.c,1.614,1.615
by Zoltan Ponekker 28 Nov '02

28 Nov '02

Update of /cvsroot/mplayer/main In directory mail:/var/tmp.root/cvs-serv13186 Modified Files: mplayer.c Log Message: - add Rüdiger Kuhlmann's <mplayer-list-UGa6JdjLujS2(a)ruediger-kuhlmann.de> patch - fix one 10l bug Index: mplayer.c =================================================================== RCS file: /cvsroot/mplayer/main/mplayer.c,v retrieving revision 1.614 retrieving revision 1.615 diff -u -r1.614 -r1.615 --- mplayer.c 23 Nov 2002 10:57:44 -0000 1.614 +++ mplayer.c 28 Nov 2002 19:01:24 -0000 1.615 @@ -2674,6 +2674,7 @@ } if ( sh_video ) guiIntfStruct.TimeSec=d_video->pts; else if ( sh_audio ) guiIntfStruct.TimeSec=sh_audio->delay; + guiIntfStruct.LengthInSec=demuxer_get_time_length(demuxer); guiGetEvent( guiReDraw,NULL ); guiGetEvent( guiSetVolume,NULL ); if(guiIntfStruct.Playing==0) break; // STOP

1 0

CVS: main/Gui/skin skin.c,1.20,1.21
by Zoltan Ponekker 28 Nov '02

28 Nov '02

Update of /cvsroot/mplayer/main/Gui/skin In directory mail:/var/tmp.root/cvs-serv13186/Gui/skin Modified Files: skin.c Log Message: - add Rüdiger Kuhlmann's <mplayer-list-UGa6JdjLujS2(a)ruediger-kuhlmann.de> patch - fix one 10l bug Index: skin.c =================================================================== RCS file: /cvsroot/mplayer/main/Gui/skin/skin.c,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- skin.c 25 Nov 2002 17:33:30 -0000 1.20 +++ skin.c 28 Nov 2002 19:01:50 -0000 1.21 @@ -10,6 +10,7 @@ #include "../../config.h" #include "../../mp_msg.h" #include "../../help_mp.h" +#include "../mplayer/widgets.h" listItems * skinAppMPlayer = &appMPlayer; @@ -25,11 +26,14 @@ void ERRORMESSAGE( const char * format, ... ) { char p[512]; + char tmp[512]; va_list ap; va_start( ap,format ); vsnprintf( p,512,format,ap ); va_end( ap ); mp_msg( MSGT_GPLAYER,MSGL_STATUS,MSGTR_SKIN_ERRORMESSAGE,linenumber,p ); + snprintf( tmp,512,MSGTR_SKIN_ERRORMESSAGE,linenumber,p ); + gtkMessageBox( GTK_MB_FATAL,tmp ); } #define CHECKDEFLIST( str ) \

1 0

CVS: main/libao2 ao_oss.c,1.34,1.35
by Richard Felker CVS 28 Nov '02

28 Nov '02

Update of /cvsroot/mplayer/main/libao2 In directory mail:/var/tmp.root/cvs-serv13045/libao2 Modified Files: ao_oss.c Log Message: 1l, opposite meaning of what's intended! Index: ao_oss.c =================================================================== RCS file: /cvsroot/mplayer/main/libao2/ao_oss.c,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- ao_oss.c 28 Nov 2002 16:14:08 -0000 1.34 +++ ao_oss.c 28 Nov 2002 16:15:13 -0000 1.35 @@ -117,7 +117,7 @@ #ifdef __linux__ /* Remove the non-blocking flag */ if(fcntl(audio_fd, F_SETFL, 0) < 0) { - mp_msg(MSGT_AO,MSGL_ERR,"audio_setup: Can't make filedescriptor non-blocking: %s\n", strerror(errno)); + mp_msg(MSGT_AO,MSGL_ERR,"audio_setup: Can't make filedescriptor blocking: %s\n", strerror(errno)); return 0; } #endif

1 0

CVS: main/libao2 ao_oss.c,1.33,1.34
by Richard Felker CVS 28 Nov '02

28 Nov '02

Update of /cvsroot/mplayer/main/libao2 In directory mail:/var/tmp.root/cvs-serv10993/libao2 Modified Files: ao_oss.c Log Message: avoid giving a /dev/dsp fd to child processes!! (menu exec, xscreensaver nonsense, etc) other parts of mplayer should be fixed like this as well! Index: ao_oss.c =================================================================== RCS file: /cvsroot/mplayer/main/libao2/ao_oss.c,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- ao_oss.c 1 Nov 2002 17:46:42 -0000 1.33 +++ ao_oss.c 28 Nov 2002 16:14:08 -0000 1.34 @@ -121,6 +121,10 @@ return 0; } #endif + +#if defined(FD_CLOEXEC) && defined(F_SETFD) + fcntl(audio_fd, F_SETFD, FD_CLOEXEC); +#endif ao_data.bps=channels; if(format != AFMT_U8 && format != AFMT_S8)

1 0

CVS: main/Gui/mplayer mw.c,1.92,1.93
by Zoltan Ponekker 28 Nov '02

28 Nov '02

Update of /cvsroot/mplayer/main/Gui/mplayer In directory mail:/var/tmp.root/cvs-serv28619/mplayer Modified Files: mw.c Log Message: no exit on fulscreen if you press esc Index: mw.c =================================================================== RCS file: /cvsroot/mplayer/main/Gui/mplayer/mw.c,v retrieving revision 1.92 retrieving revision 1.93 diff -u -r1.92 -r1.93 --- mw.c 27 Nov 2002 23:11:49 -0000 1.92 +++ mw.c 28 Nov 2002 00:44:24 -0000 1.93 @@ -640,7 +640,7 @@ { switch ( Key ) { - case wsEnter: msg=evPlay; break; + case wsEnter: msg=evPlay; break; case wsXF86LowerVolume: msg=evDecVolume; break; case wsXF86RaiseVolume: msg=evIncVolume; break; case wsXF86Mute: msg=evMute; break; @@ -649,6 +649,14 @@ case wsXF86Prev: msg=evPrev; break; case wsXF86Next: msg=evNext; break; case wsXF86Media: msg=evLoad; break; + case wsEscape: + if ( appMPlayer.subWindow.isFullScreen ) + { + if ( guiIntfStruct.event_struct ) + { memset( guiIntfStruct.event_struct,0,sizeof( XEvent ) ); guiIntfStruct.event_struct=NULL; } + mplEventHandling( evNormalSize,0 ); + break; + } default: vo_x11_putkey( Key ); return; }

1 0