X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Finterface%2Finterface.c;h=00871e4a98612afad9fd8f0c2882b5ad4b2ad5fc;hb=5de1345f2c547e4eb1ca1231f3353f8987f3f201;hp=4314135eeb0f42eb1cc6b06ff104123f1ad96696;hpb=7d2f6de57c4def2f33ff81c1f602621255c63a3c;p=vlc diff --git a/src/interface/interface.c b/src/interface/interface.c index 4314135eeb..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-2001 VideoLAN - * $Id: interface.c,v 1.99 2002/08/29 23:53:22 massiot Exp $ + * Copyright (C) 1998-2007 the VideoLAN team + * $Id$ * * Authors: Vincent Seguin * @@ -12,7 +12,7 @@ * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the @@ -20,169 +20,253 @@ * * 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. *****************************************************************************/ +/** + * \file + * This file contains functions related to interface management + */ + + /***************************************************************************** * Preamble *****************************************************************************/ -#include /* ENOMEM */ -#include /* free(), strtol() */ -#include /* FILE */ -#include /* strerror() */ -#include /* off_t */ -#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 "interface.h" - -#include "video.h" -#include "video_output.h" +#include "vlc_interface.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( 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. - *****************************************************************************/ -intf_thread_t* __intf_Create( vlc_object_t *p_this ) +static vlc_mutex_t lock = VLC_STATIC_MUTEX; + +#undef intf_Create +/** + * Create and start an interface. + * + * @param p_this the calling vlc_object_t + * @param psz_module a preferred interface module + * @return VLC_SUCCESS or an error code + */ +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; + 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; - } - - /* Choose the best module */ - p_intf->p_module = module_Need( p_intf, "interface", "$intf" ); - - if( p_intf->p_module == NULL ) - { - msg_Err( p_intf, "no suitable intf module" ); - vlc_object_destroy( p_intf ); - return NULL; - } + return VLC_ENOMEM; - /* Initialize structure */ - p_intf->b_menu = 0; - p_intf->b_menu_change = 0; + /* 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 ); - /* Initialize mutexes */ - vlc_mutex_init( p_intf, &p_intf->change_lock ); + 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 ); - msg_Dbg( p_intf, "interface initialized" ); + var_AddCallback( p_intf, "intf-add", AddIntfCallback, NULL ); - /* Attach interface to its parent object */ - vlc_object_attach( p_intf, p_this ); + /* 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 - return p_intf; -} + /* 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 interface module" ); + goto error; + } -/***************************************************************************** - * 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. - *****************************************************************************/ -vlc_error_t 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 ); - p_intf->b_die = 1; - - /* 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", p_intf->pf_run, - 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; } + p_intf->p_next = libvlc_priv( p_libvlc )->p_intf; + libvlc_priv( p_libvlc )->p_intf = p_intf; + vlc_mutex_unlock( &lock ); + return VLC_SUCCESS; + +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; } -/***************************************************************************** - * intf_StopThread: end the interface thread - ***************************************************************************** - * This function asks the interface thread to stop. - *****************************************************************************/ -void intf_StopThread( intf_thread_t *p_intf ) + +/** + * Stops and destroys all interfaces + * @param p_libvlc the LibVLC instance + */ +void intf_DestroyAll( libvlc_int_t *p_libvlc ) { - /* Tell the interface to die */ - if( !p_intf->b_block ) + intf_thread_t *p_first; + + assert( !vlc_object_alive( p_libvlc ) ); + + 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 ); + + /* Cleanup the interfaces */ + for( intf_thread_t *p_intf = p_first; p_intf != NULL; ) { - p_intf->b_die = 1; + intf_thread_t *p_next = p_intf->p_next; + + 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 + * + * @param p_this: interface object + */ +static void* RunInterface( vlc_object_t *p_this ) +{ + intf_thread_t *p_intf = (intf_thread_t *)p_this; - /* Wait for the thread to exit */ - vlc_thread_join( p_intf ); + p_intf->pf_run( p_intf ); + return NULL; } -/***************************************************************************** - * intf_Destroy: clean interface after main loop - ***************************************************************************** - * This function destroys specific interfaces and close output devices. - *****************************************************************************/ -void intf_Destroy( intf_thread_t *p_intf ) +#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 ) { - /* Unlock module */ - module_Unneed( p_intf, p_intf->p_module ); + intf_thread_t *p_intf = (intf_thread_t *)p_this; + libvlc_int_t * p_libvlc = p_intf->p_libvlc; + int canc = vlc_savecancel (); - vlc_mutex_destroy( &p_intf->change_lock ); + libvlc_InternalWait( p_libvlc ); - /* Free structure */ - vlc_object_destroy( p_intf ); + vlc_object_kill( p_intf ); /* Kill the stupid first thread interface */ + vlc_restorecancel (canc); + return NULL; } +#endif -/* 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. - *****************************************************************************/ -static void Manager( intf_thread_t *p_intf ) +static int AddIntfCallback( vlc_object_t *p_this, char const *psz_cmd, + vlc_value_t oldval, vlc_value_t newval, void *p_data ) { - while( !p_intf->b_die ) - { - msleep( INTF_IDLE_SLEEP ); + (void)psz_cmd; (void)oldval; (void)p_data; + char* psz_intf; - if( p_intf->p_vlc->b_die ) - { - p_intf->b_die = 1; - return; - } - } -} + /* Try to create the interface */ + 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( ret ) + msg_Err( p_this, "interface \"%s\" initialization failed", + newval.psz_string ); + return ret; +}