X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Finterface%2Finterface.c;h=41cb47804d6180a8a5401d49b7bfa2407b78f40b;hb=96b814ba7c70d9aaacbfb13d890b842c34f2da25;hp=016a0543ef67c36e626f6ae9eb951c9f1d4e104d;hpb=464bd2e5b4a533b2b232b472390abd0bdab5b93d;p=vlc diff --git a/src/interface/interface.c b/src/interface/interface.c index 016a0543ef..41cb47804d 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.100 2002/10/11 22:32:56 sam 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,266 @@ * * 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 "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 ) +/** + * Destroy the interface after the main loop endeed. + * + * @param p_obj: the interface thread + */ +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 ); + config_ChainDestroy( p_intf->p_cfg ); + vlc_mutex_destroy( &p_intf->change_lock ); +} + + +/** + * Create the interface, and prepare it for main loop. It opens ouput device + * and creates specific interfaces. Sends its own error messages. + * + * @param p_this the calling vlc_object_t + * @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 ) { intf_thread_t * p_intf; /* Allocate structure */ p_intf = vlc_object_create( p_this, VLC_OBJECT_INTF ); if( !p_intf ) - { - msg_Err( p_this, "out of memory" ); return NULL; - } +#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", "$intf" ); + 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 ); + msg_Err( p_intf, "no suitable interface module" ); + 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; - /* Initialize mutexes */ - vlc_mutex_init( p_intf, &p_intf->change_lock ); - - msg_Dbg( p_intf, "interface initialized" ); + 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; } -/***************************************************************************** - * 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. - *****************************************************************************/ + +/** + * Starts and runs the interface thread. + * + * @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 ) +#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" ); + msg_Err( p_intf, "cannot spawn libvlc death monitoring thread" ); return VLC_EGENERIC; } + RunInterface( VLC_OBJECT(p_intf) ); - p_intf->pf_run( p_intf ); + /* Make sure our MonitorLibVLCDeath thread exit */ + vlc_object_kill( p_intf ); + /* It is monitoring libvlc, not the p_intf */ + vlc_object_kill( 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 +#endif + /* Run the interface in a separate thread */ + if( 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" ); + return VLC_EGENERIC; } return VLC_SUCCESS; } -/***************************************************************************** - * intf_StopThread: end the interface thread - ***************************************************************************** - * This function asks the interface thread to stop. - *****************************************************************************/ + +/** + * Stops the interface thread + * + * This function asks the interface thread to stop + * @param p_intf the interface thread + */ 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 ); } -/***************************************************************************** - * intf_Destroy: clean interface after main loop - ***************************************************************************** - * This function destroys specific interfaces and close output devices. - *****************************************************************************/ -void intf_Destroy( intf_thread_t *p_intf ) + + +/* 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 ) { - /* Unlock module */ - module_Unneed( p_intf, p_intf->p_module ); + intf_thread_t *p_intf = (intf_thread_t *)p_this; + vlc_value_t val, text; + int canc = vlc_savecancel (); - vlc_mutex_destroy( &p_intf->change_lock ); + /* 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 = (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 ); + vlc_restorecancel (canc); + + /* Give control to the interface */ + if( p_intf->pf_run ) + p_intf->pf_run( p_intf ); - /* Free structure */ - vlc_object_destroy( p_intf ); + return NULL; } -/* Following functions are local */ +#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 (); -/***************************************************************************** - * 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 ) + libvlc_InternalWait( p_libvlc ); + + 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 ) { - while( !p_intf->b_die ) + (void)psz_cmd; (void)oldval; (void)p_data; + intf_thread_t *p_intf; + char* psz_intf; + + /* Try to create the interface */ + if( asprintf( &psz_intf, "%s,none", newval.psz_string ) == -1 ) + return VLC_ENOMEM; + + p_intf = intf_Create( p_this->p_libvlc, psz_intf ); + free( psz_intf ); + if( p_intf == NULL ) { - msleep( INTF_IDLE_SLEEP ); + msg_Err( p_this, "interface \"%s\" initialization failed", + newval.psz_string ); + return VLC_EGENERIC; + } - if( p_intf->p_vlc->b_die ) - { - p_intf->b_die = VLC_TRUE; - return; - } + /* Try to run the interface */ + if( intf_RunThread( p_intf ) != VLC_SUCCESS ) + { + vlc_object_detach( p_intf ); + vlc_object_release( p_intf ); + return VLC_EGENERIC; } + + return VLC_SUCCESS; }