Update of /cvsroot/mplayer/main/Gui/mplayer In directory mail:/var/tmp.root/cvs-serv24199/Gui/mplayer Modified Files: mw.h play.c play.h Log Message: - add dxr3 gui support (dialogbox, etc.) - fix one small dvd playing bug ( dvd playing don't del the playlist) - add some ifdef() check Index: mw.h =================================================================== RCS file: /cvsroot/mplayer/main/Gui/mplayer/mw.h,v retrieving revision 1.77 retrieving revision 1.78 diff -u -r1.77 -r1.78 --- mw.h 14 Aug 2002 12:17:04 -0000 1.77 +++ mw.h 14 Aug 2002 23:02:43 -0000 1.78 @@ -246,7 +246,7 @@ case evSetVCDTrack: guiIntfStruct.Track=(int)param; case evPlayVCD: - gtkSet( gtkClearStruct,guiALL,NULL ); + gtkSet( gtkClearStruct,0,(void *)guiALL ); guiIntfStruct.StreamType=STREAMTYPE_VCD; goto play; #endif @@ -256,7 +256,7 @@ guiIntfStruct.DVD.current_chapter=1; guiIntfStruct.DVD.current_angle=1; play_dvd_2: - gtkSet( gtkClearStruct,guiALL - guiDVD,NULL ); + gtkSet( gtkClearStruct,0,(void *)(guiALL - guiDVD) ); guiIntfStruct.StreamType=STREAMTYPE_DVD; #endif case evPlay: @@ -283,16 +283,13 @@ { case STREAMTYPE_STREAM: case STREAMTYPE_FILE: - gtkSet( gtkClearStruct,guiALL - guiFilenames,NULL ); + gtkSet( gtkClearStruct,0,(void *)(guiALL - guiFilenames) ); break; #ifdef HAVE_VCD case STREAMTYPE_VCD: - gtkSet( gtkClearStruct,guiALL - guiVCD - guiFilenames,NULL ); - if ( !cdrom_device ) - { - cdrom_device=DEFAULT_CDROM_DEVICE; - guiSetFilename( guiIntfStruct.Filename,cdrom_device ); - } + gtkSet( gtkClearStruct,0,(void *)(guiALL - guiVCD - guiFilenames) ); + if ( !cdrom_device ) cdrom_device=DEFAULT_CDROM_DEVICE; + mplSetFileName( NULL,cdrom_device,STREAMTYPE_VCD ); if ( guiIntfStruct.Playing != 2 ) { if ( !guiIntfStruct.Track ) @@ -307,12 +304,9 @@ #endif #ifdef USE_DVDREAD case STREAMTYPE_DVD: - gtkSet( gtkClearStruct,guiALL - guiDVD - guiFilenames,NULL ); - if ( !dvd_device ) - { - dvd_device=DEFAULT_DVD_DEVICE; - guiSetFilename( guiIntfStruct.Filename,dvd_device ) - } + gtkSet( gtkClearStruct,0,(void *)(guiALL - guiDVD - guiFilenames) ); + if ( !dvd_device ) dvd_device=DEFAULT_DVD_DEVICE; + mplSetFileName( NULL,dvd_device,STREAMTYPE_DVD ); if ( guiIntfStruct.Playing != 2 ) { dvd_title=guiIntfStruct.DVD.current_title; @@ -696,7 +690,7 @@ free( str ); } - mplSetFileName( NULL,files[0] ); + mplSetFileName( NULL,files[0],STREAMTYPE_FILE ); if ( guiIntfStruct.Playing == 1 ) mplEventHandling( evStop,0 ); mplEventHandling( evPlay,0 ); Index: play.c =================================================================== RCS file: /cvsroot/mplayer/main/Gui/mplayer/play.c,v retrieving revision 1.73 retrieving revision 1.74 diff -u -r1.73 -r1.74 --- play.c 14 Aug 2002 12:17:04 -0000 1.73 +++ play.c 14 Aug 2002 23:02:43 -0000 1.74 @@ -24,6 +24,8 @@ #include "../skin/skin.h" #include "../skin/font.h" +#include "../libmpdemux/stream.h" + extern float rel_seek_secs; extern int abs_seek_pos; @@ -246,14 +248,14 @@ btnModify( evFullScreen,!appMPlayer.subWindow.isFullScreen ); } -void mplSetFileName( char * dir,char * name ) +void mplSetFileName( char * dir,char * name,int type ) { if ( !name ) return; if ( !dir ) guiSetFilename( guiIntfStruct.Filename,name ) else guiSetDF( guiIntfStruct.Filename,dir,name ) - guiIntfStruct.StreamType=STREAMTYPE_FILE; + guiIntfStruct.StreamType=type; guiIntfStruct.FilenameChanged=1; gfree( (void **)&guiIntfStruct.AudioFile ); gfree( (void **)&guiIntfStruct.Subtitlename ); @@ -285,7 +287,7 @@ default: if ( (prev=gtkSet( gtkGetPrevPlItem,0,NULL)) ) { - mplSetFileName( prev->path,prev->name ); + mplSetFileName( prev->path,prev->name,STREAMTYPE_FILE ); mplGotoTheNext=0; break; } @@ -321,7 +323,7 @@ default: if ( (next=gtkSet( gtkGetNextPlItem,0,NULL)) ) { - mplSetFileName( next->path,next->name ); + mplSetFileName( next->path,next->name,STREAMTYPE_FILE ); mplGotoTheNext=0; break; } Index: play.h =================================================================== RCS file: /cvsroot/mplayer/main/Gui/mplayer/play.h,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- play.h 25 Jul 2002 20:26:34 -0000 1.27 +++ play.h 14 Aug 2002 23:02:43 -0000 1.28 @@ -28,6 +28,6 @@ extern void ChangeSkin( char * name ); extern void EventHandling( void ); -extern void mplSetFileName( char * dir,char * name ); +extern void mplSetFileName( char * dir,char * name,int type ); #endif