X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Finterface%2Finterface.c;h=1e15b8c1b98be9519ed448697a62e34ce2cad7ff;hb=ed2a403f13bf8265d16ec5a721f8b27e07945e79;hp=e6bcb39005f0b9a426d478f6d3e7bc870dfea124;hpb=02857df0642c1c975af6e6756ef8b7691e4e061b;p=vlc diff --git a/src/interface/interface.c b/src/interface/interface.c index e6bcb39005..1e15b8c1b9 100644 --- a/src/interface/interface.c +++ b/src/interface/interface.c @@ -33,24 +33,45 @@ * 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 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,19 +80,14 @@ 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 ); @@ -83,33 +99,31 @@ intf_thread_t* __intf_Create( vlc_object_t *p_this, const char *psz_module, 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; - - for( i = 0 ; i< i_options; i++ ) - { - var_OptionParse( p_intf, ppsz_options[i] ); - } + p_intf->b_interaction = false; + p_intf->b_should_run_on_first_thread = false; /* 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, false ); 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; } @@ -127,21 +141,19 @@ 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; - - /* Hack to get Mac OS X Cocoa runtime, - * which need access to the main thread */ + /* 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 ); + vlc_object_detach( p_intf ); + vlc_object_release( p_intf ); return VLC_SUCCESS; } /* 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; @@ -161,35 +173,10 @@ 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 ); - } + 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 ); -} - - /* Following functions are local */ /***************************************************************************** @@ -197,49 +184,9 @@ void intf_Destroy( intf_thread_t *p_intf ) *****************************************************************************/ static void RunInterface( intf_thread_t *p_intf ) { - 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; 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 ); - /* Variable used for interface spawning */ var_Create( p_intf, "intf-add", VLC_VAR_STRING | VLC_VAR_HASCHOICE | VLC_VAR_ISCOMMAND ); @@ -266,10 +213,15 @@ static void RunInterface( intf_thread_t *p_intf ) do { /* Give control to the interface */ - p_intf->pf_run( p_intf ); - - /* Reset play on start status */ - p_intf->b_play = VLC_FALSE; + if( p_intf->pf_run ) + p_intf->pf_run( p_intf ); + else + { + vlc_object_lock( p_intf ); + while( vlc_object_alive( p_intf ) ) + vlc_object_wait( p_intf ); + vlc_object_unlock( p_intf ); + } if( !p_intf->psz_switch_intf ) { @@ -284,30 +236,17 @@ 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; /* FIXME */ - p_intf->b_dead = VLC_FALSE; + p_intf->b_die = false; /* FIXME */ + p_intf->b_dead = false; + vlc_mutex_unlock( &p_intf->object_lock ); + p_intf->psz_intf = psz_intf; p_intf->p_module = module_Need( p_intf, "interface", psz_intf, 0 ); - free( psz_intf ); } while( p_intf->p_module ); } -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 ); - vlc_object_kill( p_intf ); - - return VLC_SUCCESS; -} - static int AddIntfCallback( vlc_object_t *p_this, char const *psz_cmd, vlc_value_t oldval, vlc_value_t newval, void *p_data ) { @@ -318,7 +257,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 ) { @@ -331,7 +270,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; }