Commit b394e8e7 authored by Pierre d'Herbemont's avatar Pierre d'Herbemont

minimal_macosx: Add a KillerThread, that will kill the App when the intf is killed.

parent f3b97438
...@@ -89,6 +89,28 @@ extern OSErr CPSGetCurrentProcess( CPSProcessSerNum *psn); ...@@ -89,6 +89,28 @@ extern OSErr CPSGetCurrentProcess( CPSProcessSerNum *psn);
extern OSErr CPSEnableForegroundOperation( CPSProcessSerNum *psn, UInt32 _arg2, UInt32 _arg3, UInt32 _arg4, UInt32 _arg5); extern OSErr CPSEnableForegroundOperation( CPSProcessSerNum *psn, UInt32 _arg2, UInt32 _arg3, UInt32 _arg4, UInt32 _arg5);
extern OSErr CPSSetFrontProcess( CPSProcessSerNum *psn); extern OSErr CPSSetFrontProcess( CPSProcessSerNum *psn);
/*****************************************************************************
* KillerThread: Thread that kill the application
*****************************************************************************/
static void * KillerThread( void *user_data )
{
NSAutoreleasePool * o_pool = [[NSAutoreleasePool alloc] init];
intf_thread_t *p_intf = user_data;
vlc_object_lock ( p_intf );
while( vlc_object_alive( p_intf ) )
vlc_object_wait( p_intf );
vlc_object_unlock( p_intf );
msg_Dbg( p_intf, "Killing the Mac OS X module" );
/* We are dead, terminate */
[NSApp terminate: nil];
[o_pool release];
return NULL;
}
/***************************************************************************** /*****************************************************************************
* Run: main loop * Run: main loop
*****************************************************************************/ *****************************************************************************/
...@@ -108,6 +130,11 @@ static void Run( intf_thread_t *p_intf ) ...@@ -108,6 +130,11 @@ static void Run( intf_thread_t *p_intf )
sigemptyset( &set ); sigemptyset( &set );
sigaddset( &set, SIGTERM ); sigaddset( &set, SIGTERM );
pthread_sigmask( SIG_UNBLOCK, &set, NULL ); pthread_sigmask( SIG_UNBLOCK, &set, NULL );
/* Setup a thread that will monitor the module killing */
pthread_t killer_thread;
pthread_create( &killer_thread, NULL, KillerThread, p_intf );
CPSProcessSerNum PSN; CPSProcessSerNum PSN;
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
[NSApplication sharedApplication]; [NSApplication sharedApplication];
...@@ -116,6 +143,9 @@ static void Run( intf_thread_t *p_intf ) ...@@ -116,6 +143,9 @@ static void Run( intf_thread_t *p_intf )
if (!CPSSetFrontProcess(&PSN)) if (!CPSSetFrontProcess(&PSN))
[NSApplication sharedApplication]; [NSApplication sharedApplication];
[NSApp run]; [NSApp run];
pthread_join( killer_thread, NULL );
[pool release]; [pool release];
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment