X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Finterface%2Finterface.c;h=b850eeb4102923768ca29298f5d4229b5522c68e;hb=ca6669acaae8a1e0c4ec8ad7e98e6a3a837a8d61;hp=fb157e4a2112ce5ce745ee925fcbf0ce177b312d;hpb=62c8ef3ed868ba9fd5d1e84c920bc0fc3606ac66;p=vlc diff --git a/src/interface/interface.c b/src/interface/interface.c index fb157e4a21..b850eeb410 100644 --- a/src/interface/interface.c +++ b/src/interface/interface.c @@ -33,24 +33,46 @@ * Preamble *****************************************************************************/ -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include #include #include #include "vlc_interface.h" -#include "modules/modules.h" // Gruik! +#include "libvlc.h" /***************************************************************************** * Local prototypes *****************************************************************************/ -static void RunInterface( intf_thread_t *p_intf ); - -static int SwitchIntfCallback( vlc_object_t *, char const *, - vlc_value_t , vlc_value_t , void * ); +static void* RunInterface( vlc_object_t *p_this ); +#if defined( __APPLE__ ) || defined( WIN32 ) +static void * MonitorLibVLCDeath( vlc_object_t *p_this ); +#endif static int AddIntfCallback( vlc_object_t *, char const *, vlc_value_t , vlc_value_t , void * ); +/** + * \brief Destroy the interface after the main loop endeed. + * + * \param p_intf the interface thread + * \return nothing + */ +static void intf_Destroy( vlc_object_t *obj ) +{ + intf_thread_t *p_intf = (intf_thread_t *)obj; + + /* Unlock module if present (a switch may have failed) */ + if( p_intf->p_module ) + module_unneed( p_intf, p_intf->p_module ); + + free( p_intf->psz_intf ); + vlc_mutex_destroy( &p_intf->change_lock ); +} + /***************************************************************************** * intf_Create: prepare interface before main loop ***************************************************************************** @@ -59,58 +81,46 @@ static int AddIntfCallback( vlc_object_t *, char const *, *****************************************************************************/ /** * Create the interface, and prepare it for main loop. - * You can give some additional options to be used for interface initialization * * \param p_this the calling vlc_object_t * \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, const char *const *ppsz_options ) +intf_thread_t* __intf_Create( vlc_object_t *p_this, const char *psz_module ) { intf_thread_t * p_intf; - int i; /* Allocate structure */ p_intf = vlc_object_create( p_this, VLC_OBJECT_INTF ); if( !p_intf ) - { - msg_Err( p_this, "out of memory" ); return NULL; - } - p_intf->pf_request_window = NULL; - p_intf->pf_release_window = NULL; - p_intf->pf_control_window = NULL; - p_intf->b_play = VLC_FALSE; - p_intf->b_interaction = VLC_FALSE; - p_intf->b_should_run_on_first_thread = VLC_FALSE; - - for( i = 0 ; i< i_options; i++ ) - { - var_OptionParse( p_intf, ppsz_options[i] ); - } + p_intf->b_interaction = false; +#if defined( __APPLE__ ) || defined( WIN32 ) + p_intf->b_should_run_on_first_thread = false; +#endif /* Choose the best module */ - p_intf->p_module = module_Need( p_intf, "interface", psz_module, VLC_FALSE ); + p_intf->psz_intf = strdup( psz_module ); + p_intf->p_module = module_need( p_intf, "interface", psz_module, true ); if( p_intf->p_module == NULL ) { msg_Err( p_intf, "no suitable interface module" ); - vlc_object_destroy( p_intf ); + free( p_intf->psz_intf ); + vlc_object_release( p_intf ); return NULL; } /* Initialize structure */ - p_intf->b_menu = VLC_FALSE; - p_intf->b_menu_change = VLC_FALSE; + p_intf->b_menu = false; + p_intf->b_menu_change = false; /* Initialize mutexes */ - vlc_mutex_init( p_intf, &p_intf->change_lock ); + vlc_mutex_init( &p_intf->change_lock ); /* Attach interface to its parent object */ vlc_object_attach( p_intf, p_this ); + vlc_object_set_destructor( p_intf, intf_Destroy ); return p_intf; } @@ -128,21 +138,33 @@ intf_thread_t* __intf_Create( vlc_object_t *p_this, const char *psz_module, */ int intf_RunThread( intf_thread_t *p_intf ) { - /* This interface doesn't need to be run */ - if( p_intf->pf_run == NULL ) - return VLC_SUCCESS; - +#if defined( __APPLE__ ) || defined( WIN32 ) /* Hack to get Mac OS X Cocoa runtime running * (it needs access to the main thread) */ if( p_intf->b_should_run_on_first_thread ) { - RunInterface( p_intf ); + if( vlc_thread_create( p_intf, "interface", MonitorLibVLCDeath, + VLC_THREAD_PRIORITY_LOW, false ) ) + { + msg_Err( p_intf, "cannot spawn libvlc death monitoring thread" ); + return VLC_EGENERIC; + } + RunInterface( VLC_OBJECT(p_intf) ); + + /* Make sure our MonitorLibVLCDeath thread exit */ + vlc_object_kill( p_intf ); + /* It is monitoring libvlc, not the p_intf */ + vlc_object_signal( p_intf->p_libvlc ); + vlc_thread_join( p_intf ); + + vlc_object_detach( p_intf ); + vlc_object_release( p_intf ); return VLC_SUCCESS; } - +#endif /* Run the interface in a separate thread */ if( vlc_thread_create( p_intf, "interface", RunInterface, - VLC_THREAD_PRIORITY_LOW, VLC_FALSE ) ) + VLC_THREAD_PRIORITY_LOW, false ) ) { msg_Err( p_intf, "cannot spawn interface thread" ); return VLC_EGENERIC; @@ -162,84 +184,19 @@ void intf_StopThread( intf_thread_t *p_intf ) { /* Tell the interface to die */ vlc_object_kill( p_intf ); - if( p_intf->pf_run != NULL ) - { - vlc_cond_signal( &p_intf->object_wait ); - vlc_thread_join( p_intf ); - } -} - -/** - * \brief Destroy the interface after the main loop endeed. - * - * Destroys interfaces and closes output devices - * \param p_intf the interface thread - * \return nothing - */ -void intf_Destroy( intf_thread_t *p_intf ) -{ - /* Unlock module if present (a switch may have failed) */ - if( p_intf->p_module ) - { - module_Unneed( p_intf, p_intf->p_module ); - } - - vlc_mutex_destroy( &p_intf->change_lock ); - - /* Free structure */ - vlc_object_destroy( p_intf ); + vlc_thread_join( p_intf ); } - /* Following functions are local */ /***************************************************************************** * RunInterface: setups necessary data and give control to the interface *****************************************************************************/ -static void RunInterface( intf_thread_t *p_intf ) +static void* RunInterface( vlc_object_t *p_this ) { - static const char *ppsz_interfaces[] = - { - "skins2", "Skins 2", -#ifndef WIN32 - "wxwidgets", "wxWidgets", -#endif - NULL, NULL - }; - const char **ppsz_parser; - - vlc_list_t *p_list; - int i; + intf_thread_t *p_intf = (intf_thread_t *)p_this; vlc_value_t val, text; - char *psz_intf; - - /* Variable used for interface switching */ - p_intf->psz_switch_intf = NULL; - var_Create( p_intf, "intf-switch", VLC_VAR_STRING | - VLC_VAR_HASCHOICE | VLC_VAR_ISCOMMAND ); - text.psz_string = _("Switch interface"); - var_Change( p_intf, "intf-switch", VLC_VAR_SETTEXT, &text, NULL ); - - /* Only fill the list with available modules */ - p_list = vlc_list_find( p_intf, VLC_OBJECT_MODULE, FIND_ANYWHERE ); - for( ppsz_parser = ppsz_interfaces; *ppsz_parser; ppsz_parser += 2 ) - { - for( i = 0; i < p_list->i_count; i++ ) - { - 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 = (char *)ppsz_parser[0]; - text.psz_string = (char *)_(ppsz_parser[1]); - var_Change( p_intf, "intf-switch", VLC_VAR_ADDCHOICE, - &val, &text ); - break; - } - } - } - vlc_list_release( p_list ); - - var_AddCallback( p_intf, "intf-switch", SwitchIntfCallback, NULL ); + int canc = vlc_savecancel (); /* Variable used for interface spawning */ var_Create( p_intf, "intf-add", VLC_VAR_STRING | @@ -247,7 +204,8 @@ 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 = (char *)"rc"; text.psz_string = (char *)"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 = (char *)"telnet"; text.psz_string = (char *)_("Telnet Interface"); @@ -263,52 +221,52 @@ static void RunInterface( intf_thread_t *p_intf ) var_Change( p_intf, "intf-add", VLC_VAR_ADDCHOICE, &val, &text ); var_AddCallback( p_intf, "intf-add", AddIntfCallback, NULL ); + vlc_restorecancel (canc); - do - { - /* Give control to the interface */ + /* Give control to the interface */ + if( p_intf->pf_run ) p_intf->pf_run( p_intf ); - /* Reset play on start status */ - p_intf->b_play = VLC_FALSE; - - if( !p_intf->psz_switch_intf ) - { - break; - } - - /* Make sure the old interface is completely uninitialized */ - module_Unneed( p_intf, p_intf->p_module ); - - /* Provide ability to switch the main interface on the fly */ - psz_intf = p_intf->psz_switch_intf; - p_intf->psz_switch_intf = NULL; - - vlc_mutex_lock( &p_intf->object_lock ); - p_intf->b_die = VLC_FALSE; /* FIXME */ - p_intf->b_dead = VLC_FALSE; - - vlc_mutex_unlock( &p_intf->object_lock ); - - p_intf->p_module = module_Need( p_intf, "interface", psz_intf, 0 ); - free( psz_intf ); - } - while( p_intf->p_module ); + return NULL; } -static int SwitchIntfCallback( vlc_object_t *p_this, char const *psz_cmd, - vlc_value_t oldval, vlc_value_t newval, void *p_data ) +#if defined( __APPLE__ ) || defined( WIN32 ) +/***************************************************************************** + * MonitorLibVLCDeath: Used when b_should_run_on_first_thread is set. + *****************************************************************************/ +static void * MonitorLibVLCDeath( vlc_object_t * p_this ) { intf_thread_t *p_intf = (intf_thread_t *)p_this; - (void)psz_cmd; (void)oldval; (void)p_data; + libvlc_int_t * p_libvlc = p_intf->p_libvlc; + int canc = vlc_savecancel (); - p_intf->psz_switch_intf = - malloc( strlen(newval.psz_string) + sizeof(",none") ); - sprintf( p_intf->psz_switch_intf, "%s,none", newval.psz_string ); - vlc_object_kill( p_intf ); + vlc_object_lock( p_libvlc ); + while(vlc_object_alive( p_libvlc ) ) + { + if(p_intf->b_die) + { + vlc_object_unlock( p_libvlc ); + return NULL; + } + vlc_object_wait( p_libvlc ); + } + vlc_object_unlock( p_libvlc ); - return VLC_SUCCESS; + /* Someone killed libvlc */ + + /* Make sure we kill all interface objects, especially + * those that are blocking libvlc (running on main thread) */ + vlc_list_t * p_list = vlc_list_find( p_libvlc, VLC_OBJECT_INTF, FIND_CHILD ); + for( int i = 0; i < p_list->i_count; i++ ) + { + vlc_object_t * p_intf = p_list->p_values[i].p_object; + vlc_object_kill( p_intf ); + } + vlc_list_release( p_list ); + vlc_restorecancel (canc); + return NULL; } +#endif static int AddIntfCallback( vlc_object_t *p_this, char const *psz_cmd, vlc_value_t oldval, vlc_value_t newval, void *p_data ) @@ -320,7 +278,7 @@ static int AddIntfCallback( vlc_object_t *p_this, char const *psz_cmd, /* 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 ); + p_intf = intf_Create( p_this->p_libvlc, psz_intf ); free( psz_intf ); if( p_intf == NULL ) { @@ -333,7 +291,7 @@ static int AddIntfCallback( vlc_object_t *p_this, char const *psz_cmd, if( intf_RunThread( p_intf ) != VLC_SUCCESS ) { vlc_object_detach( p_intf ); - intf_Destroy( p_intf ); + vlc_object_release( p_intf ); return VLC_EGENERIC; }