X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Finterface%2Finterface.c;h=eeda2263b4724238eab80b38bc09a80a5be2ed84;hb=fa9803042fcf9161cef764a77d707f0b4bba2d58;hp=df26af55978769dd42015401359fa0077e83c996;hpb=7f583e0549b3b4d31a685c42d04442cfcff17230;p=vlc diff --git a/src/interface/interface.c b/src/interface/interface.c index df26af5597..eeda2263b4 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.92 2002/03/11 07:23:10 gbazin 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,35 +20,57 @@ * * 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 -#include "stream_control.h" -#include "input_ext-intf.h" +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif -#include "audio_output.h" +#include -#include "interface.h" -#include "intf_playlist.h" +#include +#include -#include "video.h" -#include "video_output.h" +#include "vlc_interface.h" +#include "modules/modules.h" // Gruik! +#include "libvlc.h" /***************************************************************************** * Local prototypes *****************************************************************************/ -static void intf_Manage( intf_thread_t *p_intf ); +static void RunInterface( intf_thread_t *p_intf ); + +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 @@ -56,174 +78,196 @@ static void intf_Manage( intf_thread_t *p_intf ); * This function opens output devices and creates specific interfaces. It sends * its own error messages. *****************************************************************************/ -intf_thread_t* intf_Create( void ) +/** + * Create the interface, and prepare it for main loop. + * + * \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; - char *psz_name; /* Allocate structure */ - p_intf = malloc( sizeof( intf_thread_t ) ); + p_intf = vlc_object_create( p_this, VLC_OBJECT_INTF ); if( !p_intf ) - { - intf_ErrMsg( "intf error: cannot create interface thread (%s)", - strerror( ENOMEM ) ); - return( NULL ); - } + return NULL; + p_intf->b_interaction = false; + p_intf->b_should_run_on_first_thread = false; /* Choose the best module */ - psz_name = config_GetPszVariable( "intf" ); - p_intf->p_module = module_Need( MODULE_CAPABILITY_INTF, psz_name, - (void *)p_intf ); + p_intf->psz_intf = strdup( psz_module ); + p_intf->p_module = module_Need( p_intf, "interface", psz_module, false ); - if( psz_name ) free( psz_name ); if( p_intf->p_module == NULL ) { - intf_ErrMsg( "intf error: no suitable intf module" ); - free( p_intf ); - return( NULL ); + msg_Err( p_intf, "no suitable interface module" ); + free( p_intf->psz_intf ); + vlc_object_release( p_intf ); + return NULL; } -#define f p_intf->p_module->p_functions->intf.functions.intf - p_intf->pf_open = f.pf_open; - p_intf->pf_close = f.pf_close; - p_intf->pf_run = f.pf_run; -#undef f - - /* Initialize callbacks */ - p_intf->pf_manage = intf_Manage; - /* Initialize structure */ - p_intf->b_die = 0; - - p_intf->b_menu = 0; - p_intf->b_menu_change = 0; + p_intf->b_menu = false; + p_intf->b_menu_change = false; /* Initialize mutexes */ vlc_mutex_init( &p_intf->change_lock ); - intf_WarnMsg( 1, "intf: interface initialized"); - return( p_intf ); + /* 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_Manage: manage interface + * intf_RunThread: launch the interface thread ***************************************************************************** - * This function has to be called regularly by the interface plugin. It - * checks for playlist end, module expiration, message flushing, and a few - * other useful things. + * This function either creates a new thread and runs the interface in it. *****************************************************************************/ -static void intf_Manage( intf_thread_t *p_intf ) +/** + * 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 ) { - /* Manage module bank */ - module_ManageBank( ); + /* 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, false ) ) + { + msg_Err( p_intf, "cannot spawn interface thread" ); + return VLC_EGENERIC; + } - vlc_mutex_lock( &p_input_bank->lock ); + return VLC_SUCCESS; +} - if( p_input_bank->i_count ) - { - int i_input; - input_thread_t *p_input; +/** + * 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 */ + vlc_object_kill( p_intf ); + vlc_object_signal( p_intf ); + vlc_thread_join( p_intf ); +} - for( i_input = 0; i_input < p_input_bank->i_count; i_input++ ) - { - p_input = p_input_bank->pp_input[i_input]; - - if( p_input->i_status == THREAD_OVER ) - { - input_DestroyThread( p_input ); - p_input_bank->pp_input[i_input] = NULL; - p_input_bank->i_count--; - } - else if( ( p_input->i_status == THREAD_READY - || p_input->i_status == THREAD_ERROR ) - && ( p_input->b_error || p_input->b_eof ) ) - { - input_StopThread( p_input, NULL ); - } - } +/* Following functions are local */ - vlc_mutex_unlock( &p_input_bank->lock ); - } - /* If no stream is being played, try to find one */ - else +/***************************************************************************** + * RunInterface: setups necessary data and give control to the interface + *****************************************************************************/ +static void RunInterface( intf_thread_t *p_intf ) +{ + vlc_value_t val, text; + char *psz_intf; + + /* 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 ); + + do { -// vlc_mutex_lock( &p_main->p_playlist->change_lock ); - - if( !p_main->p_playlist->b_stopped ) + /* Give control to the interface */ + if( p_intf->pf_run ) + p_intf->pf_run( p_intf ); + else { - /* Select the next playlist item */ - intf_PlaylistNext( p_main->p_playlist ); - - /* don't loop by default: stop at playlist end */ - if( p_main->p_playlist->i_index == -1 ) - { - p_main->p_playlist->b_stopped = 1; - } - else - { - input_thread_t *p_input; - - p_main->p_playlist->b_stopped = 0; - p_main->p_playlist->i_mode = PLAYLIST_FORWARD + - config_GetIntVariable( "playlist_loop" ); - intf_WarnMsg( 3, "intf: creating new input thread" ); - p_input = input_CreateThread( &p_main->p_playlist->current, - NULL ); - if( p_input != NULL ) - { - p_input_bank->pp_input[ p_input_bank->i_count ] = p_input; - p_input_bank->i_count++; - } - } - - vlc_mutex_unlock( &p_input_bank->lock ); + vlc_object_lock( p_intf ); + while( vlc_object_alive( p_intf ) ) + vlc_object_wait( p_intf ); + vlc_object_unlock( p_intf ); } - else + + if( !p_intf->psz_switch_intf ) { - vlc_mutex_unlock( &p_input_bank->lock ); - - /* playing has been stopped: we no longer need outputs */ - if( p_aout_bank->i_count ) - { - /* FIXME kludge that does not work with several outputs */ - aout_DestroyThread( p_aout_bank->pp_aout[0], NULL ); - p_aout_bank->i_count--; - } - if( p_vout_bank->i_count ) - { - vout_DestroyThread( p_vout_bank->pp_vout[0], NULL ); - p_vout_bank->i_count--; - } + break; } -// vlc_mutex_unlock( &p_main->p_playlist->change_lock ); + /* Make sure the old interface is completely uninitialized */ + module_Unneed( p_intf, p_intf->p_module ); + + /* Provide ability to switch the main interface on the fly */ + psz_intf = p_intf->psz_switch_intf; + p_intf->psz_switch_intf = NULL; + + 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 ); } + while( p_intf->p_module ); } -/***************************************************************************** - * intf_Destroy: clean interface after main loop - ***************************************************************************** - * This function destroys specific interfaces and close output devices. - *****************************************************************************/ -void intf_Destroy( 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 ) { - /* Destroy interfaces */ - p_intf->pf_close( p_intf ); - -#if 0 - /* Close input thread, if any (blocking) */ - if( p_intf->p_input ) - { - input_DestroyThread( p_intf->p_input, NULL ); - } -#endif + intf_thread_t *p_intf; + char *psz_intf = malloc( strlen(newval.psz_string) + sizeof(",none") ); - /* Unlock module */ - module_Unneed( p_intf->p_module ); + (void)psz_cmd; (void)oldval; (void)p_data; - vlc_mutex_destroy( &p_intf->change_lock ); + /* Try to create the interface */ + sprintf( psz_intf, "%s,none", newval.psz_string ); + p_intf = intf_Create( p_this->p_libvlc, psz_intf ); + free( psz_intf ); + if( p_intf == NULL ) + { + msg_Err( p_this, "interface \"%s\" initialization failed", + newval.psz_string ); + return VLC_EGENERIC; + } + + /* 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; + } - /* Free structure */ - free( p_intf ); + return VLC_SUCCESS; }