mirror of https://github.com/mpv-player/mpv
gtk exit cleanup
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1701 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
ce8520a39b
commit
541720dbbf
|
@ -147,7 +147,7 @@ void gtkSigHandler( int s )
|
|||
gtkVisibleAboutBox=1;
|
||||
break;
|
||||
case evExit:
|
||||
gtkExit();
|
||||
gtk_main_quit();
|
||||
break;
|
||||
}
|
||||
gtkShMem->message=0;
|
||||
|
|
|
@ -4,6 +4,7 @@
|
|||
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
#include <sys/wait.h>
|
||||
#include <unistd.h>
|
||||
#include <string.h>
|
||||
#include <signal.h>
|
||||
|
@ -80,7 +81,7 @@ static void gtkThreadProc( int argc,char * argv[] )
|
|||
gtkSendMessage( evGtkIsOk );
|
||||
|
||||
gtk_main();
|
||||
dbprintf( 6,"[gtk] exit.\n" );
|
||||
printf( "[gtk] exit.\n" );
|
||||
exit( 0 );
|
||||
}
|
||||
|
||||
|
@ -93,10 +94,12 @@ void gtkInit( int argc,char* argv[], char *envp[] )
|
|||
if ( ( gtkChildPID = fork() ) == 0 ) gtkThreadProc( argc,argv );
|
||||
}
|
||||
|
||||
void gtkDone( void )
|
||||
{
|
||||
void gtkDone( void ){
|
||||
int status;
|
||||
gtkSendMessage(evExit);
|
||||
usleep(50000); // 50ms should be enough!
|
||||
printf("gtk killed...\n");
|
||||
kill( gtkChildPID,SIGKILL );
|
||||
usleep( 1000 );
|
||||
}
|
||||
|
||||
void gtkMessageBox( gchar * str )
|
||||
|
@ -135,5 +138,3 @@ void gtkSetDefaultToCList( GtkWidget * list,char * item )
|
|||
if ( ( i=gtkFindCList( list,item ) ) > -1 ) gtk_clist_select_row( GTK_CLIST( list ),i,0 );
|
||||
}
|
||||
|
||||
void gtkExit( void )
|
||||
{ gtk_main_quit(); }
|
||||
|
|
|
@ -80,6 +80,5 @@ extern int gtkFillSkinList( gchar * dir );
|
|||
extern void gtkClearList( GtkWidget * list );
|
||||
extern void gtkSetDefaultToCList( GtkWidget * list,char * item );
|
||||
extern int gtkFindCList( GtkWidget * list,char * item );
|
||||
extern void gtkExit( void );
|
||||
|
||||
#endif
|
Loading…
Reference in New Issue