August 2001 - MPlayer-cvslog - lists.mplayerhq.hu

CVS: main mplayer.c,1.268,1.269
by Arpi of Ize 31 Aug '01

31 Aug '01

Update of /cvsroot/mplayer/main In directory mplayer:/var/tmp.root/cvs-serv22721 Modified Files: mplayer.c Log Message: fixed interaction between commandlien and fileselector Index: mplayer.c =================================================================== RCS file: /cvsroot/mplayer/main/mplayer.c,v retrieving revision 1.268 retrieving revision 1.269 diff -u -r1.268 -r1.269 --- mplayer.c 31 Aug 2001 22:35:04 -0000 1.268 +++ mplayer.c 31 Aug 2001 22:58:41 -0000 1.269 @@ -581,13 +581,13 @@ #ifdef HAVE_NEW_GUI if ( use_gui ) { - if(filename) strcpy( mplShMem->Filename,filename ); + if(filename && !mplShMem->FilenameChanged) strcpy( mplShMem->Filename,filename ); // mplShMem->Playing= (gui_no_filename) ? 0 : 1; while(mplShMem->Playing!=1){ usleep(20000); EventHandling(); } - if(gui_no_filename){ + if(mplShMem->FilenameChanged){ filename=mplShMem->Filename; } } @@ -1494,6 +1494,7 @@ #endif if(osd_function==OSD_PAUSE){ + int gui_pause_flag=0; // gany! mp_msg(MSGT_CPLAYER,MSGL_STATUS,"\n------ PAUSED -------\r");fflush(stdout); #ifdef HAVE_NEW_GUI if(use_gui) mplShMem->Playing=2; @@ -1511,7 +1512,8 @@ #ifdef HAVE_NEW_GUI if(use_gui){ EventHandling(); - if(mplShMem->Playing!=2 || (rel_seek_secs || abs_seek_pos)) break; // end of pause or seek + if(mplShMem->Playing!=2 || (rel_seek_secs || abs_seek_pos)) + { gui_pause_flag=1; break; } // end of pause or seek } #endif if(use_stdin) usec_sleep(1000); // do not eat the CPU @@ -1520,7 +1522,7 @@ if (audio_out && sh_audio) audio_out->resume(); // resume audio #ifdef HAVE_NEW_GUI - if(use_gui) if(mplShMem->Playing==2) mplShMem->Playing=1; + if(use_gui && !gui_pause_flag) mplShMem->Playing=1; // play from keyboard #endif }

1 0

CVS: main mplayer.c,1.267,1.268
by Arpi of Ize 31 Aug '01

31 Aug '01

Update of /cvsroot/mplayer/main In directory mplayer:/var/tmp.root/cvs-serv20972 Modified Files: mplayer.c Log Message: fixed 'n' key bug :) Index: mplayer.c =================================================================== RCS file: /cvsroot/mplayer/main/mplayer.c,v retrieving revision 1.267 retrieving revision 1.268 diff -u -r1.267 -r1.268 --- mplayer.c 31 Aug 2001 21:06:20 -0000 1.267 +++ mplayer.c 31 Aug 2001 22:35:04 -0000 1.268 @@ -555,6 +555,8 @@ if ( !use_gui ) load_termcap(NULL); // load key-codes #endif +// ========== Init keyboard FIFO (connection to libvo) ============ +make_pipe(&keyb_fifo_get,&keyb_fifo_put); //========= Catch terminate signals: ================ // terminate requests: @@ -920,10 +922,6 @@ else encode_index_name=NULL; sh_audio=d_audio->sh=NULL; } - -// ========== Init keyboard FIFO (connection to libvo) ============ - -make_pipe(&keyb_fifo_get,&keyb_fifo_put); // ========== Init display (sh_video->disp_w*sh_video->disp_h/out_fmt) ============

1 0

CVS: main/Gui/mplayer sw.h,1.7,1.8 play.c,1.19,1.20 psignal.c,1.8,1.9
by Zoltan Ponekker 31 Aug '01

31 Aug '01

Update of /cvsroot/mplayer/main/Gui/mplayer In directory mplayer:/var/tmp.root/cvs-serv18324/Gui/mplayer Modified Files: sw.h play.c psignal.c Log Message: fix resize Index: sw.h =================================================================== RCS file: /cvsroot/mplayer/main/Gui/mplayer/sw.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sw.h 31 Aug 2001 21:19:52 -0000 1.7 +++ sw.h 31 Aug 2001 22:07:53 -0000 1.8 @@ -50,18 +50,15 @@ if ( ( mplShMem->Playing ) )//&&( appMPlayer.subWindow.State == wsWindowExpose ) ) { -printf( "------> redraw volib.\n" ); - wsSetBackgroundRGB( &appMPlayer.subWindow,0,0,0 ); - wsClearWindow( appMPlayer.subWindow ); vo_expose=1; mplSubRender=0; } if ( mplSubRender ) { -printf( "------> redraw video.\n" ); - wsSetBackgroundRGB( &appMPlayer.subWindow,appMPlayer.subR,appMPlayer.subG,appMPlayer.subB ); - wsClearWindow( appMPlayer.subWindow ); + wsSetForegroundRGB( &appMPlayer.subWindow,appMPlayer.subR,appMPlayer.subG,appMPlayer.subB ); + XFillRectangle( wsDisplay,appMPlayer.subWindow.WindowID,appMPlayer.subWindow.wGC,0,0, + appMPlayer.subWindow.Width,appMPlayer.subWindow.Height ); if ( appMPlayer.sub.Bitmap.Image ) { wsConvert( &appMPlayer.subWindow,appMPlayer.sub.Bitmap.Image,appMPlayer.sub.Bitmap.ImageSize ); Index: play.c =================================================================== RCS file: /cvsroot/mplayer/main/Gui/mplayer/play.c,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- play.c 31 Aug 2001 21:19:52 -0000 1.19 +++ play.c 31 Aug 2001 22:07:53 -0000 1.20 @@ -48,9 +48,6 @@ void mplStop() { if ( !mplShMem->Playing ) return; -// --- -printf("%%%%%% STOP \n"); -// --- mplShMem->Playing=0; mplShMem->TimeSec=0; if ( !appMPlayer.subWindow.isFullScreen ) @@ -67,34 +64,27 @@ if ( ( mplShMem->Filename[0] == 0 )|| ( mplShMem->Playing == 1 ) ) return; if ( mplShMem->Playing == 2 ) { mplPause(); return; } -// --- -//printf("%%%%%% PLAY \n"); -// --- mplShMem->Playing=1; -// wsPostRedisplay( &appMPlayer.subWindow ); + wsClearWindow( appMPlayer.subWindow ); mplSubRender=0; } void mplPause( void ) { -// --- -//printf("%%%%%% PAUSE \n"); -// --- switch( mplShMem->Playing ) { case 1: // playing mplShMem->Playing=2; btnModify( evPlaySwitchToPause,btnReleased ); btnModify( evPauseSwitchToPlay,btnDisabled ); - mplSubRender=0; break; case 2: // paused mplShMem->Playing=1; btnModify( evPlaySwitchToPause,btnDisabled ); btnModify( evPauseSwitchToPlay,btnReleased ); - mplSubRender=0; break; } + mplSubRender=0; } void mplResize( unsigned int X,unsigned int Y,unsigned int width,unsigned int height ) @@ -124,18 +114,12 @@ void mplRelSeek( float s ) { // -+s -// --- -//printf("%%%%%% RelSEEK=%5.3f \n",s); -// --- rel_seek_secs=s; abs_seek_pos=0; } void mplAbsSeek( float s ) { // 0.0 ... 100.0 -// --- -//printf("%%%%%% AbsSEEK=%5.3f \n",s); rel_seek_secs=0.01*s; abs_seek_pos=3; -// --- } listItems tmpList; Index: psignal.c =================================================================== RCS file: /cvsroot/mplayer/main/Gui/mplayer/psignal.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- psignal.c 31 Aug 2001 21:23:55 -0000 1.8 +++ psignal.c 31 Aug 2001 22:07:53 -0000 1.9 @@ -156,7 +156,10 @@ break; case evSkinBrowser: mplShMem->SkinChange=1; break; case evFileLoaded: - strcpy( mplShMem->Filename,gtkShMem->fs.dir ); strcat( mplShMem->Filename,"/" ); strcat( mplShMem->Filename,gtkShMem->fs.filename ); + strcpy( mplShMem->Filename,gtkShMem->fs.dir ); + strcat( mplShMem->Filename,"/" ); + strcat( mplShMem->Filename,gtkShMem->fs.filename ); + printf( "%%%%%%%% Playing file: %s\n",mplShMem->Filename ); mplShMem->FilenameChanged=1; if ( mplMainAutoPlay ) mplGeneralTimer=1; break;

1 0

CVS: main/Gui/wm ws.c,1.8,1.9 ws.h,1.2,1.3
by Zoltan Ponekker 31 Aug '01

31 Aug '01

Update of /cvsroot/mplayer/main/Gui/wm In directory mplayer:/var/tmp.root/cvs-serv18078/Gui/wm Modified Files: ws.c ws.h Log Message: add wsSetForegroundRGB Index: ws.c =================================================================== RCS file: /cvsroot/mplayer/main/Gui/wm/ws.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- ws.c 31 Aug 2001 21:16:58 -0000 1.8 +++ ws.c 31 Aug 2001 22:06:28 -0000 1.9 @@ -434,8 +434,7 @@ // win->wGCV.background=wsBlack; win->wGC=XCreateGC( wsDisplay,win->WindowID, -// GCForeground | GCBackground, - 0, + GCForeground | GCBackground, &win->wGCV ); win->Visible=0; @@ -881,6 +880,23 @@ XSetWindowBackground( wsDisplay,win->WindowID,color ); } +void wsSetForegroundRGB( wsTWindow * win,int r,int g,int b ) +{ + int color = 0; + switch ( wsOutMask ) + { + case wsRGB32: + case wsRGB24: color=( r << 16 ) + ( g << 8 ) + b; break; + case wsBGR32: + case wsBGR24: color=( b << 16 ) + ( g << 8 ) + r; break; + case wsRGB16: PACK_RGB16( r,g,b,color ); break; + case wsBGR16: PACK_RGB16( b,g,r,color ); break; + case wsRGB15: PACK_RGB15( r,g,b,color ); break; + case wsBGR15: PACK_RGB15( b,g,r,color ); break; + } + XSetForeground( wsDisplay,win->wGC,color ); +// XSetWindowBackground( wsDisplay,win->WindowID,color ); +} // ---------------------------------------------------------------------------------------------- // Draw string at x,y with fc ( foreground color ) and bc ( background color ). Index: ws.h =================================================================== RCS file: /cvsroot/mplayer/main/Gui/wm/ws.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ws.h 27 Aug 2001 23:56:43 -0000 1.2 +++ ws.h 31 Aug 2001 22:06:28 -0000 1.3 @@ -202,6 +202,7 @@ extern void wsIconify( wsTWindow win ); extern void wsMoveTopWindow( wsTWindow * win ); extern void wsSetBackground( wsTWindow * win,int color ); +extern void wsSetForegroundRGB( wsTWindow * win,int r,int g,int b ); extern void wsSetBackgroundRGB( wsTWindow * win,int r,int g,int b ); #define wsClearWindow( win ); XClearWindow( wsDisplay,win.WindowID ); extern void wsSetTitle( wsTWindow * win,char * name );

1 0

CVS: main/Gui/mplayer psignal.c,1.7,1.8 play.h,1.7,1.8
by Zoltan Ponekker 31 Aug '01

31 Aug '01

Update of /cvsroot/mplayer/main/Gui/mplayer In directory mplayer:/var/tmp.root/cvs-serv14503 Modified Files: psignal.c play.h Log Message: add filenamechanged Index: psignal.c =================================================================== RCS file: /cvsroot/mplayer/main/Gui/mplayer/psignal.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- psignal.c 31 Aug 2001 14:16:28 -0000 1.7 +++ psignal.c 31 Aug 2001 21:23:55 -0000 1.8 @@ -47,51 +47,6 @@ gtkMessageBox( p ); } -/* -void mplPlayerSigHandler( int s ) -{ - #ifdef DEBUG - dbprintf( 5,"[psignal] mpl sig handler msg: %d\n",mplShMem->message ); - #endif - if ( s != SIGTYPE ) return; - switch ( mplShMem->message ) - { - case mplQuit: - exit_player( "GUI close" ); - break; - case mplPauseEvent: -// if ( osd_function != OSD_PAUSE ) osd_function=OSD_PAUSE; -// else osd_function=OSD_PLAY; - break; - case mplResizeEvent: - vo_resize=1; - vo_expose=1; - printf( "[psignal] resize.\n" ); -// if (video_out != NULL ) video_out->check_events(); - break; - case mplExposeEvent: - vo_expose=1; - printf( "[psignal] expose.\n" ); -// if (video_out != NULL ) video_out->check_events(); - break; - case mplSeekEvent: -// rel_seek_secs+=mplShMem->videodata.seek; -// if ( rel_seek_secs > 0 ) osd_function=OSD_FFW; -// else osd_function=OSD_REW; - break; - case mplIncAudioBufferDelay: -// audio_delay+=0.1; // increase audio buffer delay -// a_frame-=0.1; - break; - case mplDecAudioBufferDelay: -// audio_delay-=0.1; // increase audio buffer delay -// a_frame+=0.1; - break; - } - mplShMem->message=0; -} -*/ - void gtkSigHandler( int s ) { if ( s != SIGTYPE ) return; @@ -202,6 +157,7 @@ case evSkinBrowser: mplShMem->SkinChange=1; break; case evFileLoaded: strcpy( mplShMem->Filename,gtkShMem->fs.dir ); strcat( mplShMem->Filename,"/" ); strcat( mplShMem->Filename,gtkShMem->fs.filename ); + mplShMem->FilenameChanged=1; if ( mplMainAutoPlay ) mplGeneralTimer=1; break; case evMessageBox: Index: play.h =================================================================== RCS file: /cvsroot/mplayer/main/Gui/mplayer/play.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- play.h 31 Aug 2001 14:16:28 -0000 1.7 +++ play.h 31 Aug 2001 21:23:55 -0000 1.8 @@ -46,7 +46,9 @@ int StreamType; int TimeSec; int LengthInSec; + char Filename[4096]; + int FilenameChanged; int SkinChange; } mplCommStruct;

1 0

CVS: main/Gui/mplayer play.c,1.18,1.19 sw.h,1.6,1.7 mw.h,1.16,1.17
by Zoltan Ponekker 31 Aug '01

31 Aug '01

Update of /cvsroot/mplayer/main/Gui/mplayer In directory mplayer:/var/tmp.root/cvs-serv14073/Gui/mplayer Modified Files: play.c sw.h mw.h Log Message: majd fix play&stop&pause&redraw Index: play.c =================================================================== RCS file: /cvsroot/mplayer/main/Gui/mplayer/play.c,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- play.c 31 Aug 2001 18:46:45 -0000 1.18 +++ play.c 31 Aug 2001 21:19:52 -0000 1.19 @@ -34,12 +34,6 @@ extern float rel_seek_secs; extern int abs_seek_pos; - -void mplPlayerThread( void ) -{ -// mplayer( 0,NULL,NULL ); -} - void mplFullScreen( void ) { // if ( appMPlayer.subWindow.isFullScreen ) @@ -55,9 +49,10 @@ { if ( !mplShMem->Playing ) return; // --- -//printf("%%%%%% STOP \n"); +printf("%%%%%% STOP \n"); // --- mplShMem->Playing=0; + mplShMem->TimeSec=0; if ( !appMPlayer.subWindow.isFullScreen ) { wsMoveWindow( &appMPlayer.subWindow,appMPlayer.sub.x,appMPlayer.sub.y ); @@ -69,13 +64,14 @@ void mplPlay( void ) { - if ( ( mplShMem->Filename[0] == 0 )&& + if ( ( mplShMem->Filename[0] == 0 )|| ( mplShMem->Playing == 1 ) ) return; if ( mplShMem->Playing == 2 ) { mplPause(); return; } // --- //printf("%%%%%% PLAY \n"); // --- mplShMem->Playing=1; +// wsPostRedisplay( &appMPlayer.subWindow ); mplSubRender=0; } @@ -103,6 +99,7 @@ void mplResize( unsigned int X,unsigned int Y,unsigned int width,unsigned int height ) { + printf( "----resize---> %dx%d --- \n",width,height ); vo_setwindowsize( width,height ); vo_resize=1; } @@ -115,20 +112,9 @@ mplShMem=calloc( 1,ShMemSize ); #endif signal( SIGTYPE,mplMainSigHandler ); -// signal( SIGCHLD,SIG_IGN ); - mplShMem->Playing=0; - mplShMem->Volume=0.0f; - mplShMem->Position=0.0f; + memset( mplShMem,0,ShMemSize ); mplShMem->Balance=50.0f; - mplShMem->Track=0; - mplShMem->AudioType=0; - mplShMem->StreamType=0; - mplShMem->TimeSec=0; - mplShMem->LengthInSec=0; - -// --- -// --- } float mplGetPosition( void ) Index: sw.h =================================================================== RCS file: /cvsroot/mplayer/main/Gui/mplayer/sw.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sw.h 31 Aug 2001 11:27:21 -0000 1.6 +++ sw.h 31 Aug 2001 21:19:52 -0000 1.7 @@ -2,24 +2,64 @@ // sub window int mplSubRender = 1; -int mplSubMoved = 0; + +int VisibleMainWindow( void ) +{ + Window root,parent,me,subw,mainw; + Window * childs; + int nchilds; + int i; + int visible = 0; + + me=appMPlayer.mainWindow.WindowID; + for (;;) + { + XQueryTree( wsDisplay,me,&root,&parent,&childs,&nchilds); + XFree((char *) childs); + if (root == parent) break; + me=parent; + } + XQueryTree( wsDisplay,root,&root,&parent,&childs,&nchilds ); + mainw=me; + + me=appMPlayer.subWindow.WindowID; + for (;;) + { + XQueryTree( wsDisplay,me,&root,&parent,&childs,&nchilds); + XFree((char *) childs); + if (root == parent) break; + me=parent; + } + XQueryTree( wsDisplay,root,&root,&parent,&childs,&nchilds ); + subw=me; + + for (i=0; i < nchilds; i++) if ( childs[i]==me ) break; + for ( ;i<nchilds;i++ ) if ( childs[i] == mainw ) visible=1; +// printf( "-----------> visible main vindov: %d ---\n",visible ); + return visible; +} + +int mainisvisible1; +int mainisvisible2; +int count = 0; void mplSubDraw( wsParamDisplay ) { - if ( ( appMPlayer.subWindow.Visible == wsWindowNotVisible )|| - ( appMPlayer.subWindow.State != wsWindowExpose ) ) return; +// if ( ( appMPlayer.subWindow.Visible == wsWindowNotVisible )|| +// ( appMPlayer.subWindow.State != wsWindowExpose ) ) return; - if ( ( mplShMem->Playing )&&( appMPlayer.subWindow.State == wsWindowExpose ) ) + if ( ( mplShMem->Playing ) )//&&( appMPlayer.subWindow.State == wsWindowExpose ) ) { +printf( "------> redraw volib.\n" ); wsSetBackgroundRGB( &appMPlayer.subWindow,0,0,0 ); wsClearWindow( appMPlayer.subWindow ); - appMPlayer.subWindow.State=0; vo_expose=1; - return; + mplSubRender=0; } if ( mplSubRender ) { +printf( "------> redraw video.\n" ); wsSetBackgroundRGB( &appMPlayer.subWindow,appMPlayer.subR,appMPlayer.subG,appMPlayer.subB ); wsClearWindow( appMPlayer.subWindow ); if ( appMPlayer.sub.Bitmap.Image ) @@ -29,10 +69,14 @@ } XFlush( wsDisplay ); } + appMPlayer.subWindow.State=0; } void mplSubMouseHandle( int Button,int X,int Y,int RX,int RY ) { + static int mplSubMoved = 0; + static int oldmainisvisible = 0; + mplMouseTimer=mplMouseTimerConst; wsVisibleMouse( &appMPlayer.subWindow,wsShowMouseCursor ); @@ -46,7 +90,11 @@ mplHideMenu( RX,RY ); msButton=0; break; +// --- case wsPLMouseButton: + oldmainisvisible=VisibleMainWindow(); + printf( "----> %d %d\n",mainisvisible1,mainisvisible2 ); + //=mainisvisible; sx=X; sy=Y; msButton=wsPLMouseButton; mplSubMoved=0; @@ -65,15 +113,15 @@ } break; case wsRLMouseButton: - if ( !mplSubMoved ) + if ( ( !mplSubMoved )&& + ( appMPlayer.subWindow.isFullScreen )&& + ( !VisibleMainWindow() ) ) { - wsMoveTopWindow( &appMPlayer.mainWindow ); +wsMoveTopWindow( &appMPlayer.mainWindow ); +// else wsMoveTopWindow( &appMPlayer.mainWindow ); } msButton=0; mplSubMoved=0; break; } } - -//void mplSubResizeHandle( unsigned int X,unsigned int Y,unsigned int width,unsigned int height ) -//{ mplResize( X,Y,width,height ); } Index: mw.h =================================================================== RCS file: /cvsroot/mplayer/main/Gui/mplayer/mw.h,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- mw.h 31 Aug 2001 11:27:21 -0000 1.16 +++ mw.h 31 Aug 2001 21:19:52 -0000 1.17 @@ -130,7 +130,6 @@ wItem * item; txSample * image = NULL; int i; - char * tmp; if ( appMPlayer.mainWindow.Visible == wsWindowNotVisible || !mainVisible ) return;

1 0

CVS: main/libvo x11_common.h,1.9,1.10
by Zoltan Ponekker 31 Aug '01

31 Aug '01

Update of /cvsroot/mplayer/main/libvo In directory mplayer:/var/tmp.root/cvs-serv13789 Modified Files: x11_common.h Log Message: fix size ? Index: x11_common.h =================================================================== RCS file: /cvsroot/mplayer/main/libvo/x11_common.h,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- x11_common.h 29 Aug 2001 15:06:02 -0000 1.9 +++ x11_common.h 31 Aug 2001 21:18:22 -0000 1.10 @@ -28,6 +28,7 @@ extern int vo_xeventhandling; extern int vo_expose; extern int vo_resize; + extern void vo_x11_putkey(int key); #endif #ifdef HAVE_GUI extern Display * vo_display;

1 0

CVS: main/Gui/wm ws.c,1.7,1.8
by Zoltan Ponekker 31 Aug '01

31 Aug '01

Update of /cvsroot/mplayer/main/Gui/wm In directory mplayer:/var/tmp.root/cvs-serv13555 Modified Files: ws.c Log Message: fix move&resize Index: ws.c =================================================================== RCS file: /cvsroot/mplayer/main/Gui/wm/ws.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- ws.c 30 Aug 2001 19:44:39 -0000 1.7 +++ ws.c 31 Aug 2001 21:16:58 -0000 1.8 @@ -814,6 +814,7 @@ XSetWMNormalHints( wsDisplay,win->WindowID,&win->SizeHint ); XMoveWindow( wsDisplay,win->WindowID,win->X,win->Y ); + if ( win->ReSize ) win->ReSize( win->X,win->Y,win->Width,win->Height ); } // ---------------------------------------------------------------------------------------------- @@ -841,6 +842,7 @@ } XSetWMNormalHints( wsDisplay,win->WindowID,&win->SizeHint ); XResizeWindow( wsDisplay,win->WindowID,sx,sy ); + if ( win->ReSize ) win->ReSize( win->X,win->Y,win->Width,win->Height ); } // ----------------------------------------------------------------------------------------------

1 0

CVS: main mplayer.c,1.266,1.267
by Arpi of Ize 31 Aug '01

31 Aug '01

Update of /cvsroot/mplayer/main In directory mplayer:/var/tmp.root/cvs-serv12467 Modified Files: mplayer.c Log Message: GUI_MSG bug fixed - thanx Attila Kinali Index: mplayer.c =================================================================== RCS file: /cvsroot/mplayer/main/mplayer.c,v retrieving revision 1.266 retrieving revision 1.267 diff -u -r1.266 -r1.267 --- mplayer.c 31 Aug 2001 20:59:41 -0000 1.266 +++ mplayer.c 31 Aug 2001 21:06:20 -0000 1.267 @@ -697,7 +697,7 @@ if (dvd_auth_device) { // if (dvd_auth(dvd_auth_device,f)) { if (dvd_auth(dvd_auth_device,filename)) { - GUI_MSG( mplErrorDVDAuth ) + mp_msg(MSGT_CPLAYER,MSGL_FATAL,"Error in DVD auth...\n"); exit_player(MSGTR_Exit_error); } mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_DVDauthOk);

1 0

CVS: main mplayer.c,1.265,1.266
by Arpi of Ize 31 Aug '01

31 Aug '01

Update of /cvsroot/mplayer/main In directory mplayer:/var/tmp.root/cvs-serv11786 Modified Files: mplayer.c Log Message: endless loop (bad/missing file) fixed Index: mplayer.c =================================================================== RCS file: /cvsroot/mplayer/main/mplayer.c,v retrieving revision 1.265 retrieving revision 1.266 diff -u -r1.265 -r1.266 --- mplayer.c 31 Aug 2001 17:59:10 -0000 1.265 +++ mplayer.c 31 Aug 2001 20:59:41 -0000 1.266 @@ -1860,6 +1860,8 @@ // if(encode_name) avi_fixate(); } +goto_next_file: // don't jump here after ao/vo/getch initialization! + #ifdef HAVE_NEW_GUI if(use_gui) { @@ -1869,7 +1871,6 @@ } #endif -goto_next_file: // don't jump here after ao/vo/getch initialization! if(use_gui || ++curr_filename<num_filenames){ current_module="uninit_vcodec";

1 0