# HG changeset patch # User pontscho # Date 1015513562 0 # Node ID 27980a84496189aa8f2bb73bf54c8733817bf336 # Parent ae66f5ca2225d59153a772bf74b8ca88f996b4ed PlayToPause bug with mouse fixed diff -r ae66f5ca2225 -r 27980a844961 Gui/app.c --- a/Gui/app.c Thu Mar 07 14:16:43 2002 +0000 +++ b/Gui/app.c Thu Mar 07 15:06:02 2002 +0000 @@ -11,6 +11,7 @@ #include "wm/wskeys.h" #include "skin/skin.h" #include "mplayer/mplayer.h" +#include "interface.h" listItems appMPlayer; @@ -27,12 +28,12 @@ item->px=0; item->py=0; item->psx=0; item->psy=0; // --- item->msg=0; item->msg2=0; - item->pressed=0; + item->pressed=btnReleased; item->tmp=0; item->key=0; item->key2=0; item->Bitmap.Width=0; item->Bitmap.Height=0; item->Bitmap.BPP=0; item->Bitmap.ImageSize=0; - if ( item->Bitmap.Image ) - { free( item->Bitmap.Image ); item->Bitmap.Image=NULL; } + if ( item->Bitmap.Image ) free( item->Bitmap.Image ); + item->Bitmap.Image=NULL; // --- item->fontid=0; if ( item->label ) free( item->label ); item->label=NULL; diff -r ae66f5ca2225 -r 27980a844961 Gui/interface.h --- a/Gui/interface.h Thu Mar 07 14:16:43 2002 +0000 +++ b/Gui/interface.h Thu Mar 07 15:06:02 2002 +0000 @@ -101,6 +101,8 @@ #define guiSetPlay 1 #define guiSetPause 2 +extern char *get_path(char *filename); + extern void guiInit( int argc,char* argv[], char *envp[] ); extern void guiDone( void ); extern void guiGetEvent( int type,char * arg ); diff -r ae66f5ca2225 -r 27980a844961 Gui/mplayer/mw.h --- a/Gui/mplayer/mw.h Thu Mar 07 14:16:43 2002 +0000 +++ b/Gui/mplayer/mw.h Thu Mar 07 15:06:02 2002 +0000 @@ -23,7 +23,8 @@ case STREAMTYPE_FILE: if ( ( guiIntfStruct.Filename )&&( guiIntfStruct.Filename[0] ) ) { - strcpy( tmp,guiIntfStruct.Filename ); + if ( strrchr( guiIntfStruct.Filename,'/' ) ) strcpy( tmp,strrchr( guiIntfStruct.Filename,'/' ) + 1 ); + else strcpy( tmp,guiIntfStruct.Filename ); if ( tmp[strlen( tmp ) - 4] == '.' ) tmp[strlen( tmp ) - 4]=0; if ( tmp[strlen( tmp ) - 5] == '.' ) tmp[strlen( tmp ) - 5]=0; } else strcpy( tmp,"no file loaded" );