X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Finterface%2Finterface.c;h=51a62a59e651ef99bef21ef9b7c24e3a28e8a2f6;hb=4d654a48d8eb44db1101e96c1c29b4f3813521bc;hp=4ee2e0834e1aa2b6b4334ae98647d490d9b2dad8;hpb=c744b977176bc66a715879cccce094216dcc6c2d;p=vlc diff --git a/src/interface/interface.c b/src/interface/interface.c index 4ee2e0834e..51a62a59e6 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,47 +32,46 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include /* free(), strtol() */ -#include /* FILE */ -#include /* strerror() */ -#include -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif -#include "audio_output.h" +#include -#include "vlc_interface.h" -#include "vlc_video.h" -#include "video_output.h" +#include +#include -#ifdef __APPLE__ -# include -#endif +#include "vlc_interface.h" +#include "modules/modules.h" // Gruik! +#include "libvlc.h" /***************************************************************************** * Local prototypes *****************************************************************************/ -static void Manager( intf_thread_t *p_intf ); static void RunInterface( intf_thread_t *p_intf ); +static void MonitorLibVLCDeath( 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 * ); -#ifdef __APPLE__ -/***************************************************************************** - * VLCApplication interface - *****************************************************************************/ -@interface VLCApplication : NSApplication +/** + * \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 ) { - vlc_t *o_vlc; -} + intf_thread_t *p_intf = (intf_thread_t *)obj; -- (void)setVLC: (vlc_t *)p_vlc; + /* Unlock module if present (a switch may have failed) */ + if( p_intf->p_module ) + module_Unneed( p_intf, p_intf->p_module ); -@end -#endif + free( p_intf->psz_intf ); + vlc_mutex_destroy( &p_intf->change_lock ); +} /***************************************************************************** * intf_Create: prepare interface before main loop @@ -82,57 +81,44 @@ 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 prefered interface module - * \param i_options number additional options - * \param ppsz_options additional option strings + * \param psz_module a preferred interface module * \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 ) +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; - - 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; } @@ -140,101 +126,46 @@ intf_thread_t* __intf_Create( vlc_object_t *p_this, const char *psz_module, /***************************************************************************** * intf_RunThread: launch the interface thread ***************************************************************************** - * This function either creates a new thread and runs the interface in it, - * or runs the interface in the current thread, depending on b_block. + * This function either creates a new thread and runs the interface in it. *****************************************************************************/ /** - * Run the interface thread. + * Starts and runs the interface thread. * - * If b_block is not set, runs the interface in the thread, else, - * creates a new thread and runs the interface. * \param p_intf the interface thread * \return VLC_SUCCESS on success, an error number else */ int intf_RunThread( intf_thread_t *p_intf ) { -#ifdef __APPLE__ - NSAutoreleasePool * o_pool; - - if( p_intf->b_block ) + /* 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 ) { - /* 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 ) ) + if( vlc_thread_create( p_intf, "interface", MonitorLibVLCDeath, + VLC_THREAD_PRIORITY_LOW, false ) ) { - msg_Err( p_intf, "cannot spawn manager thread" ); + msg_Err( p_intf, "cannot spawn libvlc death monitoring thread" ); return VLC_EGENERIC; } - } - - if( p_intf->b_block && strncmp( p_intf->p_vlc->psz_object_name, - "clivlc", 6) ) - { - o_pool = [[NSAutoreleasePool alloc] init]; - [VLCApplication sharedApplication]; - [NSApp setVLC: p_intf->p_vlc]; - } - - if( p_intf->b_block && - ( !strncmp( p_intf->p_module->psz_object_name, "macosx" , 6 ) || - !strncmp( p_intf->p_vlc->psz_object_name, "clivlc", 6 ) ) ) - { - /* VLC in normal primary interface mode */ RunInterface( p_intf ); - p_intf->b_die = VLC_TRUE; - } - else - { - /* 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; - } - 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 ) - { - /* Run a manager thread, launch the interface, kill the manager */ - if( vlc_thread_create( p_intf, "manager", Manager, - VLC_THREAD_PRIORITY_LOW, VLC_FALSE ) ) - { - msg_Err( p_intf, "cannot spawn manager thread" ); - return VLC_EGENERIC; - } - - RunInterface( 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 ); - p_intf->b_die = VLC_TRUE; - /* Do not join the thread... intf_StopThread will do it for us */ + vlc_object_detach( p_intf ); + vlc_object_release( p_intf ); + return VLC_SUCCESS; } - else + + /* Run the interface in a separate thread */ + if( vlc_thread_create( p_intf, "interface", RunInterface, + VLC_THREAD_PRIORITY_LOW, false ) ) { - /* Run the interface in a separate thread */ - 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; - } + msg_Err( p_intf, "cannot spawn interface thread" ); + return VLC_EGENERIC; } -#endif return VLC_SUCCESS; } @@ -249,139 +180,39 @@ int intf_RunThread( intf_thread_t *p_intf ) void intf_StopThread( intf_thread_t *p_intf ) { /* Tell the interface to die */ - if( !p_intf->b_block ) - { - p_intf->b_die = VLC_TRUE; - } - - /* Wait for the thread to exit */ + vlc_object_kill( p_intf ); 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 */ -/***************************************************************************** - * 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. - *****************************************************************************/ -/** - * \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 - */ -static void Manager( intf_thread_t *p_intf ) -{ - while( !p_intf->b_die ) - { - msleep( INTF_IDLE_SLEEP ); - - if( p_intf->p_vlc->b_die ) - { - p_intf->b_die = VLC_TRUE; -#ifdef __APPLE__ - if( strncmp( p_intf->p_vlc->psz_object_name, "clivlc", 6 ) ) - { - [NSApp stop: NULL]; - } -#endif - return; - } - } -} - /***************************************************************************** * RunInterface: setups necessary data and give control to the interface *****************************************************************************/ static void RunInterface( intf_thread_t *p_intf ) { - static char *ppsz_interfaces[] = - { - "skins2", "Skins 2", - "wxwidgets", "wxWidgets", - NULL, NULL - }; - 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 = ppsz_parser[0]; - text.psz_string = 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 ); 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 ); @@ -389,10 +220,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 ) { @@ -406,28 +242,48 @@ static void RunInterface( intf_thread_t *p_intf ) 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; - p_intf->b_dead = VLC_FALSE; - vlc_mutex_unlock( &p_intf->object_lock ); + vlc_object_lock( p_intf ); + p_intf->b_die = false; /* FIXME */ + p_intf->b_dead = false; + vlc_object_unlock( p_intf ); + + 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 ) +/***************************************************************************** + * MonitorLibVLCDeath: Used when b_should_run_on_first_thread is set. + *****************************************************************************/ +static void MonitorLibVLCDeath( intf_thread_t *p_intf ) { - intf_thread_t *p_intf = (intf_thread_t *)p_this; + libvlc_int_t * p_libvlc = p_intf->p_libvlc; + vlc_object_lock( p_libvlc ); + while(vlc_object_alive( p_libvlc ) ) + { + if(p_intf->b_die) + { + vlc_object_unlock( p_libvlc ); + return; + } + vlc_object_wait( p_libvlc ); + } + vlc_object_unlock( p_libvlc ); - 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; + /* 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 ); - return VLC_SUCCESS; } static int AddIntfCallback( vlc_object_t *p_this, char const *psz_cmd, @@ -436,9 +292,11 @@ 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_vlc, psz_intf, 0, NULL ); + p_intf = intf_Create( p_this->p_libvlc, psz_intf ); free( psz_intf ); if( p_intf == NULL ) { @@ -448,50 +306,13 @@ static int AddIntfCallback( vlc_object_t *p_this, char const *psz_cmd, } /* Try to run the interface */ - p_intf->b_block = VLC_FALSE; if( intf_RunThread( p_intf ) != VLC_SUCCESS ) { vlc_object_detach( p_intf ); - intf_Destroy( p_intf ); + vlc_object_release( p_intf ); return VLC_EGENERIC; } return VLC_SUCCESS; } -#ifdef __APPLE__ -/***************************************************************************** - * VLCApplication implementation - *****************************************************************************/ -@implementation VLCApplication - -- (void)setVLC: (vlc_t *) p_vlc -{ - o_vlc = p_vlc; -} - -- (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_vlc->b_die = VLC_TRUE; -} - -@end -#endif -