X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Finterface%2Finterface.c;h=7ed0822ede3d88a4fbed96fd5ef805bf77d3f267;hb=6ee1e193fd896ab9a4729fde14f009d9ce629815;hp=c660b67765e1520627465b20d93e4226a281b30f;hpb=224b28cbae995ae40b5b3b2cdc27ab1ab427ddb6;p=vlc diff --git a/src/interface/interface.c b/src/interface/interface.c index c660b67765..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,18 +32,14 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include /* free(), strtol() */ -#include /* FILE */ -#include /* strerror() */ #include -#include -#include "audio_output.h" +#include +#include #include "vlc_interface.h" -#include "vlc_video.h" -#include "video_output.h" +#include "modules/modules.h" // Gruik! #ifdef __APPLE__ # include @@ -52,7 +48,6 @@ /***************************************************************************** * Local prototypes *****************************************************************************/ -static void Manager( intf_thread_t *p_intf ); static void RunInterface( intf_thread_t *p_intf ); static int SwitchIntfCallback( vlc_object_t *, char const *, @@ -61,6 +56,7 @@ static int AddIntfCallback( vlc_object_t *, char const *, vlc_value_t , vlc_value_t , void * ); #ifdef __APPLE__ +static void Manager( intf_thread_t *p_intf ); /***************************************************************************** * VLCApplication interface *****************************************************************************/ @@ -85,13 +81,13 @@ static int AddIntfCallback( vlc_object_t *, char const *, * You can give some additional options to be used for interface initialization * * \param p_this the calling vlc_object_t - * \param psz_module a prefered interface module + * \param psz_module a preferred interface module * \param i_options number additional options * \param ppsz_options additional option strings * \return a pointer to the created interface thread, NULL on error */ intf_thread_t* __intf_Create( vlc_object_t *p_this, const char *psz_module, - int i_options, char **ppsz_options ) + int i_options, const char *const *ppsz_options ) { intf_thread_t * p_intf; int i; @@ -156,76 +152,64 @@ 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 ) { - /* 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 ) ) + + /* If the main interface does not have a run function, + * implement a waiting loop ourselves + */ + if( p_intf->pf_run ) + RunInterface( p_intf ); + else { - 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; + while( !intf_ShouldDie( p_intf ) ) + msleep( INTF_IDLE_SLEEP * 2); } + vlc_object_kill( p_intf ); } -#else - if( p_intf->b_block ) + else { - /* Run a manager thread, launch the interface, kill the manager */ - if( vlc_thread_create( p_intf, "manager", Manager, - VLC_THREAD_PRIORITY_LOW, VLC_FALSE ) ) + /* This interface doesn't need to be run */ + 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, "cannot spawn manager thread" ); + 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; } - RunInterface( p_intf ); - - p_intf->b_die = VLC_TRUE; - /* Do not join the thread... intf_StopThread will do it for us */ - } - else - { /* Run the interface in a separate thread */ if( vlc_thread_create( p_intf, "interface", RunInterface, VLC_THREAD_PRIORITY_LOW, VLC_FALSE ) ) @@ -234,7 +218,6 @@ int intf_RunThread( intf_thread_t *p_intf ) return VLC_EGENERIC; } } -#endif return VLC_SUCCESS; } @@ -251,11 +234,13 @@ 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 ); + vlc_thread_join( p_intf ); + } } - - /* Wait for the thread to exit */ - vlc_thread_join( p_intf ); } /** @@ -283,24 +268,9 @@ void intf_Destroy( intf_thread_t *p_intf ) /* Following functions are local */ /***************************************************************************** - * Manager: helper thread for blocking interfaces - ***************************************************************************** - * If the interface is launched in the main thread, it will not listen to - * p_vlc->b_die events because it is only supposed to listen to p_intf->b_die. - * This thread takes care of the matter. + * Manager: helper thread for blocking OS X *****************************************************************************/ -/** - * \brief Helper thread for blocking interfaces. - * \ingroup vlc_interface - * - * This is a local function - * If the interface is launched in the main thread, it will not listen to - * p_vlc->b_die events because it is only supposed to listen to p_intf->b_die. - * This thread takes care of the matter. - * \see intf_RunThread - * \param p_intf an interface thread - * \return nothing - */ +#ifdef __APPLE__ static void Manager( intf_thread_t *p_intf ) { while( !p_intf->b_die ) @@ -310,23 +280,22 @@ static void Manager( intf_thread_t *p_intf ) if( p_intf->p_libvlc->b_die ) { p_intf->b_die = VLC_TRUE; -#ifdef __APPLE__ - if( strncmp( p_intf->p_libvlc->psz_object_name, "clivlc", 6 ) ) - { - [NSApp stop: NULL]; - } -#endif + if( strncmp( p_intf->p_libvlc->psz_object_name, "clivlc", 6 ) ) + { + [NSApp stop: NULL]; + } return; } } } +#endif /***************************************************************************** * RunInterface: setups necessary data and give control to the interface *****************************************************************************/ static void RunInterface( intf_thread_t *p_intf ) { - static char *ppsz_interfaces[] = + static const char *ppsz_interfaces[] = { "skins2", "Skins 2", #ifndef WIN32 @@ -334,7 +303,7 @@ static void RunInterface( intf_thread_t *p_intf ) #endif NULL, NULL }; - char **ppsz_parser; + const char **ppsz_parser; vlc_list_t *p_list; int i; @@ -357,8 +326,8 @@ static void RunInterface( intf_thread_t *p_intf ) module_t *p_module = (module_t *)p_list->p_values[i].p_object; if( !strcmp( p_module->psz_object_name, ppsz_parser[0] ) ) { - val.psz_string = ppsz_parser[0]; - text.psz_string = ppsz_parser[1]; + val.psz_string = (char *)ppsz_parser[0]; + text.psz_string = (char *)_(ppsz_parser[1]); var_Change( p_intf, "intf-switch", VLC_VAR_ADDCHOICE, &val, &text ); break; @@ -375,15 +344,19 @@ static void RunInterface( intf_thread_t *p_intf ) text.psz_string = _("Add Interface"); var_Change( p_intf, "intf-add", VLC_VAR_SETTEXT, &text, NULL ); - val.psz_string = "rc"; text.psz_string = "Console"; + val.psz_string = (char *)"rc"; text.psz_string = (char *)"Console"; var_Change( p_intf, "intf-add", VLC_VAR_ADDCHOICE, &val, &text ); - val.psz_string = "telnet"; text.psz_string = "Telnet Interface"; + val.psz_string = (char *)"telnet"; + text.psz_string = (char *)_("Telnet Interface"); var_Change( p_intf, "intf-add", VLC_VAR_ADDCHOICE, &val, &text ); - val.psz_string = "http"; text.psz_string = "Web Interface"; + val.psz_string = (char *)"http"; + text.psz_string = (char *)_("Web Interface"); var_Change( p_intf, "intf-add", VLC_VAR_ADDCHOICE, &val, &text ); - val.psz_string = "logger"; text.psz_string = "Debug logging"; + val.psz_string = (char *)"logger"; + text.psz_string = (char *)_("Debug logging"); var_Change( p_intf, "intf-add", VLC_VAR_ADDCHOICE, &val, &text ); - val.psz_string = "gestures"; text.psz_string = "Mouse Gestures"; + val.psz_string = (char *)"gestures"; + text.psz_string = (char *)_("Mouse Gestures"); var_Change( p_intf, "intf-add", VLC_VAR_ADDCHOICE, &val, &text ); var_AddCallback( p_intf, "intf-add", AddIntfCallback, NULL ); @@ -409,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 ); @@ -423,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; } @@ -438,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 ); @@ -472,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