X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Finterface%2Finterface.c;h=00871e4a98612afad9fd8f0c2882b5ad4b2ad5fc;hb=959554209ac3b6cb996a9b66fd717957dcfbd032;hp=848a8d02ddfd5c57844c6838567df27b111a9a26;hpb=96a6787bf89c264f6b778f947bc0450e42355d40;p=vlc diff --git a/src/interface/interface.c b/src/interface/interface.c index 848a8d02dd..00871e4a98 100644 --- a/src/interface/interface.c +++ b/src/interface/interface.c @@ -3,8 +3,8 @@ * This library provides basic functions for threads to interact with user * interface, such as command line. ***************************************************************************** - * Copyright (C) 1998-2004 VideoLAN - * $Id: interface.c,v 1.113 2004/02/08 11:23:17 gbazin Exp $ + * Copyright (C) 1998-2007 the VideoLAN team + * $Id$ * * Authors: Vincent Seguin * @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ /** @@ -32,319 +32,241 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include /* free(), strtol() */ -#include /* FILE */ -#include /* strerror() */ -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif -#include "stream_control.h" -#include "input_ext-intf.h" +#include +#include -#include "audio_output.h" +#include +#include #include "vlc_interface.h" - -#include "vlc_video.h" -#include "video_output.h" +#if defined( __APPLE__ ) || defined( WIN32 ) +#include "../control/libvlc_internal.h" +#endif +#include "libvlc.h" /***************************************************************************** * 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 *, - 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 * ); -/***************************************************************************** - * intf_Create: prepare interface before main loop - ***************************************************************************** - * This function opens output devices and creates specific interfaces. It sends - * its own error messages. - *****************************************************************************/ +static vlc_mutex_t lock = VLC_STATIC_MUTEX; + +#undef intf_Create /** - * Create the interface, and prepare it for main loop. + * Create and start an interface. * - * \param p_this the calling vlc_object_t - * \param psz_module a prefered interface module - * \return a pointer to the created interface thread, NULL on error + * @param p_this the calling vlc_object_t + * @param psz_module a preferred interface module + * @return VLC_SUCCESS or an error code */ -intf_thread_t* __intf_Create( vlc_object_t *p_this, const char *psz_module ) +int intf_Create( vlc_object_t *p_this, const char *psz_module ) { + libvlc_int_t *p_libvlc = p_this->p_libvlc; intf_thread_t * p_intf; - char *psz_intf; + static const char psz_type[] = "interface"; /* Allocate structure */ - p_intf = vlc_object_create( p_this, VLC_OBJECT_INTF ); + p_intf = vlc_custom_create( p_libvlc, sizeof( *p_intf ), + VLC_OBJECT_GENERIC, psz_type ); if( !p_intf ) - { - msg_Err( p_this, "out of memory" ); - return NULL; - } + return VLC_ENOMEM; - /* XXX: workaround for a bug in VLC 0.5.0 where the dvdplay plugin was - * registering itself in $interface, which we do not want to happen. */ - psz_intf = config_GetPsz( p_intf, "intf" ); - if( psz_intf ) - { - if( !strcasecmp( psz_intf, "dvdplay" ) ) - { - config_PutPsz( p_intf, "intf", "" ); - } - free( psz_intf ); - } + /* Variable used for interface spawning */ + vlc_value_t val, text; + 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 ); - /* Choose the best module */ - p_intf->p_module = module_Need( p_intf, "interface", psz_module ); + 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"); + var_Change( p_intf, "intf-add", VLC_VAR_ADDCHOICE, &val, &text ); + 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 = (char *)"logger"; + text.psz_string = (char *)_("Debug logging"); + var_Change( p_intf, "intf-add", VLC_VAR_ADDCHOICE, &val, &text ); + 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 ); + + /* Attach interface to LibVLC */ + vlc_object_attach( p_intf, p_libvlc ); +#if defined( __APPLE__ ) || defined( WIN32 ) + p_intf->b_should_run_on_first_thread = false; +#endif + + /* Choose the best module */ + p_intf->p_cfg = NULL; + char *psz_parser = *psz_module == '$' + ? var_CreateGetString(p_intf,psz_module+1) + : strdup( psz_module ); + char *psz_tmp = config_ChainCreate( &p_intf->psz_intf, &p_intf->p_cfg, + psz_parser ); + free( psz_tmp ); + free( psz_parser ); + p_intf->p_module = module_need( p_intf, "interface", p_intf->psz_intf, true ); if( p_intf->p_module == NULL ) { - msg_Err( p_intf, "no suitable intf module" ); - vlc_object_destroy( p_intf ); - return NULL; + msg_Err( p_intf, "no suitable interface module" ); + goto error; } - /* Initialize structure */ - p_intf->b_menu = VLC_FALSE; - p_intf->b_menu_change = VLC_FALSE; - - /* Initialize mutexes */ - vlc_mutex_init( p_intf, &p_intf->change_lock ); - - msg_Dbg( p_intf, "interface initialized" ); - - /* Attach interface to its parent object */ - vlc_object_attach( p_intf, p_this ); - - return p_intf; -} - -/***************************************************************************** - * 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. - *****************************************************************************/ -/** - * Run 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 ) -{ - if( p_intf->b_block ) + vlc_mutex_lock( &lock ); + if( !vlc_object_alive( p_libvlc ) ) + { + vlc_mutex_unlock( &lock ); + goto error; /* Too late! */ + } +#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 ) { - /* Run a manager thread, launch the interface, kill the manager */ - if( vlc_thread_create( p_intf, "manager", Manager, - VLC_THREAD_PRIORITY_LOW, VLC_FALSE ) ) + if( vlc_thread_create( p_intf, "interface", MonitorLibVLCDeath, + VLC_THREAD_PRIORITY_LOW ) ) { - msg_Err( p_intf, "cannot spawn manager thread" ); - return VLC_EGENERIC; + msg_Err( p_intf, "cannot spawn libvlc death monitoring thread" ); + vlc_mutex_unlock( &lock ); + goto error; } + assert( p_intf->pf_run ); + p_intf->pf_run( p_intf ); - RunInterface( p_intf ); - - p_intf->b_die = VLC_TRUE; - - /* Do not join the thread... intf_StopThread will do it for us */ + /* It is monitoring libvlc, not the p_intf */ + vlc_object_kill( p_intf->p_libvlc ); } else +#endif + /* Run the interface in a separate thread */ + if( p_intf->pf_run + && vlc_thread_create( p_intf, "interface", RunInterface, + VLC_THREAD_PRIORITY_LOW ) ) { - /* 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" ); + vlc_mutex_unlock( &lock ); + goto error; } - return VLC_SUCCESS; -} + p_intf->p_next = libvlc_priv( p_libvlc )->p_intf; + libvlc_priv( p_libvlc )->p_intf = p_intf; + vlc_mutex_unlock( &lock ); -/** - * Stops the interface thread - * - * This function asks the interface thread to stop - * \param p_intf the interface thread - * \return nothing - */ -void intf_StopThread( intf_thread_t *p_intf ) -{ - /* Tell the interface to die */ - if( !p_intf->b_block ) - { - p_intf->b_die = VLC_TRUE; - } + return VLC_SUCCESS; - /* Wait for the thread to exit */ - vlc_thread_join( p_intf ); +error: + if( p_intf->p_module ) + module_unneed( p_intf, p_intf->p_module ); + config_ChainDestroy( p_intf->p_cfg ); + free( p_intf->psz_intf ); + vlc_object_release( p_intf ); + return VLC_EGENERIC; } + /** - * \brief Destroy the interface after the main loop endeed. - * - * Destroys interfaces and closes output devices - * \param p_intf the interface thread - * \return nothing + * Stops and destroys all interfaces + * @param p_libvlc the LibVLC instance */ -void intf_Destroy( intf_thread_t *p_intf ) +void intf_DestroyAll( libvlc_int_t *p_libvlc ) { - /* Unlock module */ - module_Unneed( p_intf, p_intf->p_module ); + intf_thread_t *p_first; - vlc_mutex_destroy( &p_intf->change_lock ); + assert( !vlc_object_alive( p_libvlc ) ); - /* Free structure */ - vlc_object_destroy( p_intf ); -} + vlc_mutex_lock( &lock ); + p_first = libvlc_priv( p_libvlc )->p_intf; +#ifndef NDEBUG + libvlc_priv( p_libvlc )->p_intf = NULL; +#endif + vlc_mutex_unlock( &lock ); + /* Tell the interfaces to die */ + for( intf_thread_t *p_intf = p_first; p_intf; p_intf = p_intf->p_next ) + vlc_object_kill( 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 ) + /* Cleanup the interfaces */ + for( intf_thread_t *p_intf = p_first; p_intf != NULL; ) { - msleep( INTF_IDLE_SLEEP ); + intf_thread_t *p_next = p_intf->p_next; - if( p_intf->p_vlc->b_die ) - { - p_intf->b_die = VLC_TRUE; - return; - } + if( p_intf->pf_run ) + vlc_thread_join( p_intf ); + module_unneed( p_intf, p_intf->p_module ); + free( p_intf->psz_intf ); + config_ChainDestroy( p_intf->p_cfg ); + vlc_object_release( p_intf ); + + p_intf = p_next; } } -/***************************************************************************** +/* Following functions are local */ + +/** * RunInterface: setups necessary data and give control to the interface - *****************************************************************************/ -static void RunInterface( intf_thread_t *p_intf ) + * + * @param p_this: interface object + */ +static void* RunInterface( vlc_object_t *p_this ) { - vlc_value_t val, text; - - /* 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 ); - - val.psz_string = "skins"; text.psz_string = "Skins"; - var_Change( p_intf, "intf-switch", VLC_VAR_ADDCHOICE, &val, &text ); - val.psz_string = "skins2"; text.psz_string = "Skins 2"; - var_Change( p_intf, "intf-switch", VLC_VAR_ADDCHOICE, &val, &text ); - val.psz_string = "wxwin"; text.psz_string = "wxWindows"; - var_Change( p_intf, "intf-switch", VLC_VAR_ADDCHOICE, &val, &text ); - - 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"; - var_Change( p_intf, "intf-add", VLC_VAR_ADDCHOICE, &val, &text ); - val.psz_string = "logger"; text.psz_string = "Debug logging"; - var_Change( p_intf, "intf-add", VLC_VAR_ADDCHOICE, &val, &text ); - val.psz_string = "http"; text.psz_string = "HTTP remote control"; - var_Change( p_intf, "intf-add", VLC_VAR_ADDCHOICE, &val, &text ); - val.psz_string = "sap"; text.psz_string = "SAP interface"; - var_Change( p_intf, "intf-add", VLC_VAR_ADDCHOICE, &val, &text ); - val.psz_string = "gestures"; text.psz_string = "Mouse gestures control"; - var_Change( p_intf, "intf-add", VLC_VAR_ADDCHOICE, &val, &text ); - - var_AddCallback( p_intf, "intf-add", AddIntfCallback, NULL ); + intf_thread_t *p_intf = (intf_thread_t *)p_this; - /* Give control to the interface */ p_intf->pf_run( p_intf ); - - /* Provide ability to switch the main interface on the fly */ - while( p_intf->psz_switch_intf ) - { - char *psz_intf = p_intf->psz_switch_intf; - p_intf->psz_switch_intf = NULL; - p_intf->b_die = VLC_FALSE; - - /* Make sure the old interface is completely uninitialised */ - module_Unneed( p_intf, p_intf->p_module ); - - p_intf->p_module = module_Need( p_intf, "interface", psz_intf ); - free( psz_intf ); - - if( p_intf->p_module ) - { - p_intf->pf_run( p_intf ); - } - else break; - } + 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 ) +#include "control/libvlc_internal.h" /* libvlc_InternalWait */ +/** + * MonitorLibVLCDeath: Used when b_should_run_on_first_thread is set. + * + * @param p_this: the interface object + */ +static void * MonitorLibVLCDeath( vlc_object_t * p_this ) { intf_thread_t *p_intf = (intf_thread_t *)p_this; + 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 ); - p_intf->b_die = VLC_TRUE; + libvlc_InternalWait( p_libvlc ); - return VLC_SUCCESS; + vlc_object_kill( p_intf ); /* Kill the stupid first thread interface */ + 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 ) { - intf_thread_t *p_intf; - char *psz_intf = malloc( strlen(newval.psz_string) + sizeof(",none") ); + (void)psz_cmd; (void)oldval; (void)p_data; + char* psz_intf; /* Try to create the interface */ - sprintf( psz_intf, "%s,none", newval.psz_string ); - p_intf = intf_Create( p_this->p_vlc, psz_intf ); + if( asprintf( &psz_intf, "%s,none", newval.psz_string ) == -1 ) + return VLC_ENOMEM; + + int ret = intf_Create( VLC_OBJECT(p_this->p_libvlc), psz_intf ); free( psz_intf ); - if( p_intf == NULL ) - { + if( ret ) msg_Err( p_this, "interface \"%s\" initialization failed", newval.psz_string ); - return VLC_EGENERIC; - } - - /* 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 ); - return VLC_EGENERIC; - } - - return VLC_SUCCESS; + return ret; }