* Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
* Christophe Massiot <massiot@via.ecp.fr>
* Derk-Jan Hartman <hartman at videolan.org>
- * Felix K\9fhne <fkuehne at videolan dot org>
+ * Felix KΓΌhne <fkuehne at videolan dot org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
# include "config.h"
#endif
-#include <vlc/vlc.h>
+#include <vlc_common.h>
#include <vlc_keys.h>
#include <vlc_input.h>
+#import <vlc_interface.h>
#import <intf.h>
/*****************************************************************************
* OpenIntf: initialize interface
*****************************************************************************/
-int E_(OpenIntf) ( vlc_object_t *p_this )
+int OpenIntf ( vlc_object_t *p_this )
{
intf_thread_t *p_intf = (intf_thread_t*) p_this;
-
+
p_intf->p_sys = malloc( sizeof( intf_sys_t ) );
if( p_intf->p_sys == NULL )
{
- return( 1 );
+ return VLC_ENOMEM;
}
memset( p_intf->p_sys, 0, sizeof( *p_intf->p_sys ) );
p_intf->pf_run = Run;
- p_intf->b_should_run_on_first_thread = true;
return VLC_SUCCESS;
}
/*****************************************************************************
* CloseIntf: destroy interface
*****************************************************************************/
-void E_(CloseIntf) ( vlc_object_t *p_this )
+void CloseIntf ( vlc_object_t *p_this )
{
intf_thread_t *p_intf = (intf_thread_t*) p_this;
extern OSErr CPSEnableForegroundOperation( CPSProcessSerNum *psn, UInt32 _arg2, UInt32 _arg3, UInt32 _arg4, UInt32 _arg5);
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_mutex_init( &p_intf->p_sys->lock );
+ vlc_cond_init( &p_intf->p_sys->wait );
+
+ vlc_mutex_lock ( &p_intf->p_sys->lock );
+ while( vlc_object_alive( p_intf ) )
+ vlc_cond_wait( &p_intf->p_sys->wait, &p_intf->p_sys->lock );
+ vlc_mutex_unlock( &p_intf->p_sys->lock );
+
+ vlc_mutex_destroy( &p_intf->p_sys->lock );
+ vlc_cond_destroy( &p_intf->p_sys->wait );
+
+ /* We are dead, terminate */
+ [NSApp terminate: nil];
+ [o_pool release];
+ return NULL;
+}
+
/*****************************************************************************
* Run: main loop
*****************************************************************************/
{
sigset_t set;
- /* Do it again - for some unknown reason, vlc_thread_create() often
- * fails to go to real-time priority with the first launched thread
- * (???) --Meuuh */
- vlc_thread_set_priority( p_intf, VLC_THREAD_PRIORITY_LOW );
-
/* Make sure the "force quit" menu item does quit instantly.
* VLC overrides SIGTERM which is sent by the "force quit"
* menu item to make sure deamon mode quits gracefully, so
sigemptyset( &set );
sigaddset( &set, SIGTERM );
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;
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
[NSApplication sharedApplication];
if (!CPSSetFrontProcess(&PSN))
[NSApplication sharedApplication];
[NSApp run];
+
+ pthread_join( killer_thread, NULL );
+
[pool release];
}