X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Finterface%2Finterface.c;h=7ed0822ede3d88a4fbed96fd5ef805bf77d3f267;hb=6ee1e193fd896ab9a4729fde14f009d9ce629815;hp=1ac60bb5ce74ac12ef768893fb58ffa8dbfc33f5;hpb=d3fe7f28797d4dba65ffcdd60bf932e758a48a9e;p=vlc diff --git a/src/interface/interface.c b/src/interface/interface.c index 1ac60bb5ce..7ed0822ede 100644 --- a/src/interface/interface.c +++ b/src/interface/interface.c @@ -3,7 +3,7 @@ * This library provides basic functions for threads to interact with user * interface, such as command line. ***************************************************************************** - * Copyright (C) 1998-2004 the VideoLAN team + * Copyright (C) 1998-2007 the VideoLAN team * $Id$ * * Authors: Vincent Seguin @@ -32,9 +32,6 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include /* free(), strtol() */ -#include /* FILE */ -#include /* strerror() */ #include @@ -42,6 +39,7 @@ #include #include "vlc_interface.h" +#include "modules/modules.h" // Gruik! #ifdef __APPLE__ # include @@ -154,65 +152,37 @@ int intf_RunThread( intf_thread_t *p_intf ) #ifdef __APPLE__ NSAutoreleasePool * o_pool; - if( p_intf->b_block ) - { - /* This is the primary intf */ - /* Run a manager thread, launch the interface, kill the manager */ - if( vlc_thread_create( p_intf, "manage", Manager, - VLC_THREAD_PRIORITY_LOW, VLC_FALSE ) ) - { - msg_Err( p_intf, "cannot spawn manager thread" ); - return VLC_EGENERIC; - } - } - + /* If !clivlc, then run as a OS X application */ if( p_intf->b_block && strncmp( p_intf->p_libvlc->psz_object_name, "clivlc", 6) ) { o_pool = [[NSAutoreleasePool alloc] init]; [VLCApplication sharedApplication]; [NSApp setVLC: p_intf->p_libvlc]; - } - if( p_intf->b_block && - ( !strncmp( p_intf->p_module->psz_object_name, "macosx" , 6 ) || - !strncmp( p_intf->p_libvlc->psz_object_name, "clivlc", 6 ) ) ) - { - /* VLC in normal primary interface mode */ - RunInterface( p_intf ); - p_intf->b_die = VLC_TRUE; + if( p_intf->pf_run ) + RunInterface( p_intf ); + else + { + [NSApp run]; + while( !intf_ShouldDie( p_intf ) ) + msleep( INTF_IDLE_SLEEP * 2); + } + vlc_object_kill( p_intf ); } else +#endif + if( p_intf->b_block ) { - /* This interface doesn't need to be run */ - if( !p_intf->pf_run ) - return VLC_SUCCESS; - - /* Run the interface in a separate thread */ + /* If we are clivlc+macosx, don't run the macosx GUI */ if( !strcmp( p_intf->p_module->psz_object_name, "macosx" ) ) { msg_Err( p_intf, "You cannot run the MacOS X module as an " - "extra interface. Please read the " + "interface in clivlc mode. Please read the " "README.MacOSX.rtf file."); return VLC_EGENERIC; } - if( vlc_thread_create( p_intf, "interface", RunInterface, - VLC_THREAD_PRIORITY_LOW, VLC_FALSE ) ) - { - msg_Err( p_intf, "cannot spawn interface thread" ); - return VLC_EGENERIC; - } - - if( p_intf->b_block ) - { - /* VLC in primary interface mode with a working macosx vout */ - [NSApp run]; - p_intf->b_die = VLC_TRUE; - } - } -#else - if( p_intf->b_block ) - { + /* If the main interface does not have a run function, * implement a waiting loop ourselves */ @@ -223,8 +193,7 @@ int intf_RunThread( intf_thread_t *p_intf ) while( !intf_ShouldDie( p_intf ) ) msleep( INTF_IDLE_SLEEP * 2); } - p_intf->b_die = VLC_TRUE; - /* Do not join the thread... intf_StopThread will do it for us */ + vlc_object_kill( p_intf ); } else { @@ -232,6 +201,15 @@ int intf_RunThread( intf_thread_t *p_intf ) if( !p_intf->pf_run ) return VLC_SUCCESS; + /* Run the interface in a separate thread */ + if( !strcmp( p_intf->p_module->psz_object_name, "macosx" ) ) + { + msg_Err( p_intf, "You cannot run the MacOS X module as an " + "extra interface. Please read the " + "README.MacOSX.rtf file."); + return VLC_EGENERIC; + } + /* Run the interface in a separate thread */ if( vlc_thread_create( p_intf, "interface", RunInterface, VLC_THREAD_PRIORITY_LOW, VLC_FALSE ) ) @@ -240,7 +218,6 @@ int intf_RunThread( intf_thread_t *p_intf ) return VLC_EGENERIC; } } -#endif return VLC_SUCCESS; } @@ -257,7 +234,7 @@ void intf_StopThread( intf_thread_t *p_intf ) /* Tell the interface to die */ if( !p_intf->b_block ) { - p_intf->b_die = VLC_TRUE; + vlc_object_kill( p_intf ); if( p_intf->pf_run ) { vlc_cond_signal( &p_intf->object_wait ); @@ -405,7 +382,7 @@ static void RunInterface( intf_thread_t *p_intf ) p_intf->psz_switch_intf = NULL; vlc_mutex_lock( &p_intf->object_lock ); - p_intf->b_die = VLC_FALSE; + p_intf->b_die = VLC_FALSE; /* FIXME */ p_intf->b_dead = VLC_FALSE; vlc_mutex_unlock( &p_intf->object_lock ); @@ -419,11 +396,12 @@ static int SwitchIntfCallback( vlc_object_t *p_this, char const *psz_cmd, vlc_value_t oldval, vlc_value_t newval, void *p_data ) { intf_thread_t *p_intf = (intf_thread_t *)p_this; + (void)psz_cmd; (void)oldval; (void)p_data; p_intf->psz_switch_intf = malloc( strlen(newval.psz_string) + sizeof(",none") ); sprintf( p_intf->psz_switch_intf, "%s,none", newval.psz_string ); - p_intf->b_die = VLC_TRUE; + vlc_object_kill( p_intf ); return VLC_SUCCESS; } @@ -434,6 +412,8 @@ static int AddIntfCallback( vlc_object_t *p_this, char const *psz_cmd, intf_thread_t *p_intf; char *psz_intf = malloc( strlen(newval.psz_string) + sizeof(",none") ); + (void)psz_cmd; (void)oldval; (void)p_data; + /* Try to create the interface */ sprintf( psz_intf, "%s,none", newval.psz_string ); p_intf = intf_Create( p_this->p_libvlc, psz_intf, 0, NULL ); @@ -468,26 +448,10 @@ static int AddIntfCallback( vlc_object_t *p_this, char const *psz_cmd, o_libvlc = p_libvlc; } -- (void)stop: (id)sender -{ - NSEvent *o_event; - NSAutoreleasePool *o_pool; - [super stop:sender]; - - o_pool = [[NSAutoreleasePool alloc] init]; - /* send a dummy event to break out of the event loop */ - o_event = [NSEvent mouseEventWithType: NSLeftMouseDown - location: NSMakePoint( 1, 1 ) modifierFlags: 0 - timestamp: 1 windowNumber: [[NSApp mainWindow] windowNumber] - context: [NSGraphicsContext currentContext] eventNumber: 1 - clickCount: 1 pressure: 0.0]; - [NSApp postEvent: o_event atStart: YES]; - [o_pool release]; -} - - (void)terminate: (id)sender { - o_libvlc->b_die = VLC_TRUE; + vlc_object_kill( o_libvlc ); + [super terminate: sender]; } @end