X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Finterface%2Finterface.c;h=00871e4a98612afad9fd8f0c2882b5ad4b2ad5fc;hb=5de1345f2c547e4eb1ca1231f3353f8987f3f201;hp=218cfe3a8a1e077972691af0df191d0e1b5e6984;hpb=0765875ab57be4156314514c4d71577a6a4ca1d0;p=vlc diff --git a/src/interface/interface.c b/src/interface/interface.c index 218cfe3a8a..00871e4a98 100644 --- a/src/interface/interface.c +++ b/src/interface/interface.c @@ -3,15 +3,16 @@ * This library provides basic functions for threads to interact with user * interface, such as command line. ***************************************************************************** - * Copyright (C) 1998, 1999, 2000 VideoLAN + * Copyright (C) 1998-2007 the VideoLAN team + * $Id$ * - * Authors: + * Authors: Vincent Seguin * * This program is free software; you can redistribute it and/or modify * 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 @@ -19,714 +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 "defs.h" - -#include /* ENOMEM */ -#include /* free(), strtol() */ -#include /* FILE */ -#include /* strerror() */ -#include /* on BSD, uio.h needs types.h */ -#include /* for input.h */ - -#include "config.h" -#include "common.h" -#include "threads.h" -#include "mtime.h" -#include "plugins.h" -#include "playlist.h" -#include "input.h" - -#include "audio_output.h" -#include "intf_msg.h" -#include "interface.h" -#include "intf_cmd.h" -#include "intf_console.h" -#include "keystrokes.h" +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif -#include "video.h" -#include "video_output.h" +#include +#include -#include "main.h" - -/***************************************************************************** - * intf_channel_t: channel description - ***************************************************************************** - * A 'channel' is a descriptor of an input method. It is used to switch easily - * from source to source without having to specify the whole input thread - * configuration. The channels array, stored in the interface thread object, is - * loaded in intf_Create, and unloaded in intf_Destroy. - *****************************************************************************/ -typedef struct intf_channel_s -{ - /* Channel description */ - int i_channel; /* channel number, -1 for end of array */ - char * psz_description; /* channel description (owned) */ +#include +#include - /* Input configuration */ - int i_input_method; /* input method descriptor */ - char * psz_input_source; /* source string (owned) */ - int i_input_port; /* port */ - int i_input_vlan; /* vlan */ -} intf_channel_t; +#include "vlc_interface.h" +#if defined( __APPLE__ ) || defined( WIN32 ) +#include "../control/libvlc_internal.h" +#endif +#include "libvlc.h" /***************************************************************************** * Local prototypes *****************************************************************************/ -static int LoadChannels ( intf_thread_t *p_intf, char *psz_filename ); -static void UnloadChannels ( intf_thread_t *p_intf ); -static int ParseChannel ( intf_channel_t *p_channel, char *psz_str ); - -/***************************************************************************** - * 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( 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 * ); + +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; - typedef void ( intf_getplugin_t ) ( intf_thread_t * p_intf ); - int i_index; - int i_best_index = 0, i_best_score = 0; + static const char psz_type[] = "interface"; /* Allocate structure */ - p_intf = malloc( sizeof( intf_thread_t ) ); + p_intf = vlc_custom_create( p_libvlc, sizeof( *p_intf ), + VLC_OBJECT_GENERIC, psz_type ); if( !p_intf ) + return VLC_ENOMEM; + + /* 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 ); + + 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 ) { - intf_ErrMsg("error: %s\n", strerror( ENOMEM ) ); - return( NULL ); + msg_Err( p_intf, "no suitable interface module" ); + goto error; } - /* Get a suitable interface plugin */ - for( i_index = 0 ; i_index < p_main->p_bank->i_plugin_count ; i_index++ ) + vlc_mutex_lock( &lock ); + if( !vlc_object_alive( p_libvlc ) ) { - /* If there's a plugin in p_info ... */ - if( p_main->p_bank->p_info[ i_index ] != NULL ) - { - /* ... and if this plugin provides the functions we want ... */ - if( p_main->p_bank->p_info[ i_index ]->intf_GetPlugin != NULL ) - { - /* ... and if this plugin has a good score ... */ - if( p_main->p_bank->p_info[ i_index ]->i_score > i_best_score ) - { - /* ... then take it */ - i_best_score = p_main->p_bank->p_info[ i_index ]->i_score; - i_best_index = i_index; - } - } - } + vlc_mutex_unlock( &lock ); + goto error; /* Too late! */ } - - if( i_best_score == 0 ) - { - free( p_intf ); - return( NULL ); - } - - /* Get the plugin functions */ - ( (intf_getplugin_t *) - p_main->p_bank->p_info[ i_best_index ]->intf_GetPlugin )( p_intf ); - - /* Initialize structure */ - p_intf->b_die = 0; - p_intf->p_vout = NULL; - p_intf->p_input = NULL; - p_intf->p_keys = NULL; - - /* Load channels - the pointer will be set to NULL on failure. The - * return value is ignored since the program can work without - * channels */ - LoadChannels( p_intf, main_GetPszVariable( INTF_CHANNELS_VAR, INTF_CHANNELS_DEFAULT )); - - /* Start interfaces */ - p_intf->p_console = intf_ConsoleCreate(); - if( p_intf->p_console == NULL ) - { - intf_ErrMsg("error: can't create control console\n"); - free( p_intf ); - return( NULL ); - } - if( p_intf->p_sys_create( p_intf ) ) - { - intf_ErrMsg("error: can't create interface\n"); - intf_ConsoleDestroy( p_intf->p_console ); - free( p_intf ); - return( NULL ); - } - - intf_Msg("Interface initialized\n"); - return( p_intf ); - } - - /***************************************************************************** - * intf_Run - ***************************************************************************** - * Initialization script and main interface loop. - *****************************************************************************/ - void intf_Run( intf_thread_t *p_intf ) - { - if( p_main->p_playlist->p_list ) - { - p_intf->p_input = input_CreateThread( INPUT_METHOD_TS_FILE, NULL, 0, 0, p_main->p_intf->p_vout, p_main->p_aout, NULL ); - } - /* Execute the initialization script - if a positive number is returned, - * the script could be executed but failed */ - else if( intf_ExecScript( main_GetPszVariable( INTF_INIT_SCRIPT_VAR, INTF_INIT_SCRIPT_DEFAULT ) ) > 0 ) - { - intf_ErrMsg("warning: error(s) during startup script\n"); - } - - /* Main loop */ - while(!p_intf->b_die) - { - /* Flush waiting messages */ - intf_FlushMsg(); - - /* Manage specific interface */ - p_intf->p_sys_manage( p_intf ); - - /* Check attached threads status */ - if( (p_intf->p_vout != NULL) && p_intf->p_vout->b_error ) - { - /* FIXME: add aout error detection ?? */ - p_intf->b_die = 1; - } - if( (p_intf->p_input != NULL) && p_intf->p_input->b_error ) - { - input_DestroyThread( p_intf->p_input, NULL ); - p_intf->p_input = NULL; - intf_DbgMsg("Input thread destroyed\n"); - } - - /* Sleep to avoid using all CPU - since some interfaces needs to access - * keyboard events, a 100ms delay is a good compromise */ - msleep( INTF_IDLE_SLEEP ); - } - } - - /***************************************************************************** - * intf_Destroy: clean interface after main loop - ***************************************************************************** - * This function destroys specific interfaces and close output devices. - *****************************************************************************/ - void intf_Destroy( intf_thread_t *p_intf ) - { - p_intf_key p_cur; - p_intf_key p_next; - /* Destroy interfaces */ - p_intf->p_sys_destroy( p_intf ); - intf_ConsoleDestroy( p_intf->p_console ); - - /* Unload channels */ - UnloadChannels( p_intf ); - - /* Destroy keymap */ - - p_cur = p_intf->p_keys; - while( p_cur != NULL) - { - p_next = p_cur->next; - free(p_cur); - p_cur = p_next; - } - - - /* Free structure */ - free( p_intf ); - } - - /***************************************************************************** - * intf_SelectChannel: change channel - ***************************************************************************** - * Kill existing input, if any, and try to open a new one, using an input - * configuration table. - *****************************************************************************/ - int intf_SelectChannel( intf_thread_t * p_intf, int i_channel ) - { - intf_channel_t * p_channel; /* channel */ - - /* Look for channel in array */ - if( p_intf->p_channel != NULL ) - { - for( p_channel = p_intf->p_channel; p_channel->i_channel != -1; p_channel++ ) - { - if( p_channel->i_channel == i_channel ) - { - /* - * Change channel - */ - - /* Kill existing input, if any */ - if( p_intf->p_input != NULL ) - { - input_DestroyThread( p_intf->p_input, NULL ); - } - - intf_Msg("Channel %d: %s\n", i_channel, p_channel->psz_description ); - - /* Open a new input */ - p_intf->p_input = input_CreateThread( p_channel->i_input_method, p_channel->psz_input_source, - p_channel->i_input_port, p_channel->i_input_vlan, - p_intf->p_vout, p_main->p_aout, NULL ); - return( p_intf->p_input == NULL ); - } - } - } - - /* Channel does not exist */ - intf_Msg("Channel %d does not exist\n", i_channel ); - return( 1 ); - } - - /***************************************************************************** - * intf_AssignKey: assign standartkeys * - ***************************************************************************** - * This function fills in the associative array that links the key pressed * - * and the key we use internally. Support one extra parameter. * - ****************************************************************************/ - - void intf_AssignKey( intf_thread_t *p_intf, int r_key, int f_key, int param) - { - p_intf_key p_cur = p_intf->p_keys; - - if( p_cur == NULL ) - { - p_cur = (p_intf_key )(malloc ( sizeof( intf_key ) ) ); - p_cur->received_key = r_key; - p_cur->forwarded.key = f_key; - p_cur->forwarded.param = param; - p_cur->next = NULL; - p_intf->p_keys = p_cur; - } else { - while( p_cur->next != NULL && p_cur ->received_key != r_key) - { - p_cur = p_cur->next; - } - if( p_cur->next == NULL ) - { - p_cur->next = ( p_intf_key )( malloc( sizeof( intf_key ) ) ); - p_cur = p_cur->next; - p_cur->next = NULL; - p_cur->forwarded.param = param; - p_cur->received_key = r_key; - } - p_cur->forwarded.key = f_key; - } - } - - /***************************************************************************** - * intf_AssignSKey: assign standartkeys * - ***************************************************************************** - * This function fills in the associative array that links the key pressed * - * and the key we use internally. * - ****************************************************************************/ - void intf_AssignSKey(intf_thread_t *p_intf, int r_key, int f_key) - { - intf_AssignKey( p_intf, r_key, f_key, 0); - } - - - /* Basic getKey function... */ - keyparm intf_getKey( intf_thread_t *p_intf, int r_key) - { - keyparm reply; - - p_intf_key current = p_intf->p_keys; - while(current != NULL && current->received_key != r_key) - { - current = current->next; - } - if(current == NULL) - { /* didn't find any key in the array */ - reply.key=VLC_UNKNOWN; - reply.param=0; - } - else - { - reply.key = current->forwarded.key; - reply.param = current->forwarded.param; - } - return reply; - } - - /***************************************************************************** - * intf_AssignNormalKeys: used for normal interfaces. - ***************************************************************************** - * This function assign the basic key to the normal keys. - *****************************************************************************/ - -void intf_AssignNormalKeys( intf_thread_t *p_intf) - { - p_intf->p_intf_getKey = intf_getKey; - - intf_AssignSKey( p_intf , 'Q', VLC_QUIT); - intf_AssignSKey( p_intf , 'q', VLC_QUIT); - intf_AssignSKey( p_intf , 27, VLC_QUIT); - intf_AssignSKey( p_intf , 3, VLC_QUIT); - intf_AssignKey( p_intf , '0', VLC_CHANNEL, 0); - intf_AssignKey( p_intf , '1', VLC_CHANNEL, 1); - intf_AssignKey( p_intf , '2', VLC_CHANNEL, 2); - intf_AssignKey( p_intf , '3', VLC_CHANNEL, 3); - intf_AssignKey( p_intf , '4', VLC_CHANNEL, 4); - intf_AssignKey( p_intf , '5', VLC_CHANNEL, 5); - intf_AssignKey( p_intf , '6', VLC_CHANNEL, 6); - intf_AssignKey( p_intf , '7', VLC_CHANNEL, 7); - intf_AssignKey( p_intf , '8', VLC_CHANNEL, 8); - intf_AssignKey( p_intf , '9', VLC_CHANNEL, 9); - intf_AssignKey( p_intf , '0', VLC_CHANNEL, 0); - intf_AssignSKey( p_intf , '+', VLC_LOUDER); - intf_AssignSKey( p_intf , '-', VLC_QUIETER); - intf_AssignSKey( p_intf , 'm', VLC_MUTE); - intf_AssignSKey( p_intf , 'M', VLC_MUTE); - intf_AssignSKey( p_intf , 'g', VLC_LESS_GAMMA); - intf_AssignSKey( p_intf , 'G', VLC_MORE_GAMMA); - intf_AssignSKey( p_intf , 'c', VLC_GRAYSCALE); - intf_AssignSKey( p_intf , ' ', VLC_INTERFACE); - intf_AssignSKey( p_intf , 'i', VLC_INFO); - intf_AssignSKey( p_intf , 's', VLC_SCALING); -} - -/***************************************************************************** - * intf_ProcessKey: process standard keys - ***************************************************************************** - * This function will process standard keys and return non 0 if the key was - * unknown. - *****************************************************************************/ -int intf_ProcessKey( intf_thread_t *p_intf, int g_key ) -{ - static int i_volbackup; - keyparm i_reply; - - i_reply = intf_getKey( p_intf, g_key); - - switch( i_reply.key ) +#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 ) { - case VLC_QUIT: /* quit order */ - p_intf->b_die = 1; - break; - case VLC_CHANNEL: - /* Change channel - return code is ignored since SelectChannel displays - * its own error messages */ - intf_SelectChannel( p_intf, i_reply.param - '0' ); - break; - case VLC_LOUDER: /* volume + */ - if( (p_main->p_aout != NULL) && (p_main->p_aout->vol < VOLMAX) ) - p_main->p_aout->vol += VOLSTEP; - break; - case VLC_QUIETER: /* volume - */ - if( (p_main->p_aout != NULL) && (p_main->p_aout->vol > VOLSTEP) ) - p_main->p_aout->vol -= VOLSTEP; - break; - case VLC_MUTE: /* toggle mute */ - if( (p_main->p_aout != NULL) && (p_main->p_aout->vol)) - { - i_volbackup = p_main->p_aout->vol; - p_main->p_aout->vol = 0; - } - else if( (p_main->p_aout != NULL) && (!p_main->p_aout->vol)) - p_main->p_aout->vol = i_volbackup; - break; - case VLC_LESS_GAMMA: /* gamma - */ - if( (p_intf->p_vout != NULL) && (p_intf->p_vout->f_gamma > -INTF_GAMMA_LIMIT) ) - { - vlc_mutex_lock( &p_intf->p_vout->change_lock ); - p_intf->p_vout->f_gamma -= INTF_GAMMA_STEP; - p_intf->p_vout->i_changes |= VOUT_GAMMA_CHANGE; - vlc_mutex_unlock( &p_intf->p_vout->change_lock ); - } - break; - case VLC_MORE_GAMMA: /* gamma + */ - if( (p_intf->p_vout != NULL) && (p_intf->p_vout->f_gamma < INTF_GAMMA_LIMIT) ) - { - vlc_mutex_lock( &p_intf->p_vout->change_lock ); - p_intf->p_vout->f_gamma += INTF_GAMMA_STEP; - p_intf->p_vout->i_changes |= VOUT_GAMMA_CHANGE; - vlc_mutex_unlock( &p_intf->p_vout->change_lock ); - } - break; - case VLC_GRAYSCALE: /* toggle grayscale */ - if( p_intf->p_vout != NULL ) - { - vlc_mutex_lock( &p_intf->p_vout->change_lock ); - p_intf->p_vout->b_grayscale = !p_intf->p_vout->b_grayscale; - p_intf->p_vout->i_changes |= VOUT_GRAYSCALE_CHANGE; - vlc_mutex_unlock( &p_intf->p_vout->change_lock ); - } - break; - case VLC_INTERFACE: /* toggle interface */ - if( p_intf->p_vout != NULL ) - { - vlc_mutex_lock( &p_intf->p_vout->change_lock ); - p_intf->p_vout->b_interface = !p_intf->p_vout->b_interface; - p_intf->p_vout->i_changes |= VOUT_INTF_CHANGE; - vlc_mutex_unlock( &p_intf->p_vout->change_lock ); - } - break; - case VLC_INFO: /* toggle info */ - if( p_intf->p_vout != NULL ) - { - vlc_mutex_lock( &p_intf->p_vout->change_lock ); - p_intf->p_vout->b_info = !p_intf->p_vout->b_info; - p_intf->p_vout->i_changes |= VOUT_INFO_CHANGE; - vlc_mutex_unlock( &p_intf->p_vout->change_lock ); - } - break; - case VLC_SCALING: /* toggle scaling */ - if( p_intf->p_vout != NULL ) + if( vlc_thread_create( p_intf, "interface", MonitorLibVLCDeath, + VLC_THREAD_PRIORITY_LOW ) ) { - vlc_mutex_lock( &p_intf->p_vout->change_lock ); - p_intf->p_vout->b_scale = !p_intf->p_vout->b_scale; - p_intf->p_vout->i_changes |= VOUT_SCALE_CHANGE; - vlc_mutex_unlock( &p_intf->p_vout->change_lock ); + msg_Err( p_intf, "cannot spawn libvlc death monitoring thread" ); + vlc_mutex_unlock( &lock ); + goto error; } - break; - default: /* unknown key */ - return( 1 ); + assert( p_intf->pf_run ); + p_intf->pf_run( p_intf ); + + /* 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 ) ) + { + msg_Err( p_intf, "cannot spawn interface thread" ); + vlc_mutex_unlock( &lock ); + goto error; } - return( 0 ); + 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; } -/* following functions are local */ -/***************************************************************************** - * LoadChannels: load channels description from a file - ***************************************************************************** - * This structe describes all interface-specific data of the main (interface) - * thread. - * Each line of the file is a semicolon separated list of the following - * fields : - * integer channel number - * string channel description - * integer input method (see input.h) - * string input source - * integer input port - * integer input vlan - * The last field must end with a semicolon. - * Comments and empty lines are not explicitely allowed, but lines with parsing - * errors are ignored without warning. - *****************************************************************************/ -static int LoadChannels( intf_thread_t *p_intf, char *psz_filename ) +/** + * Stops and destroys all interfaces + * @param p_libvlc the LibVLC instance + */ +void intf_DestroyAll( libvlc_int_t *p_libvlc ) { - FILE * p_file; /* file */ - intf_channel_t * p_channel; /* current channel */ - char psz_line[INTF_MAX_CMD_SIZE]; /* line buffer */ - int i_index; /* channel or field index */ + intf_thread_t *p_first; - /* Set default value */ - p_intf->p_channel = NULL; + assert( !vlc_object_alive( p_libvlc ) ); - /* FIXME: channels are disabled */ - return( 0 ); + 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 ); - /* Open file */ - p_file = fopen( psz_filename, "r" ); - if( p_file == NULL ) - { - intf_ErrMsg("error: can't open %s (%s)\n", psz_filename, strerror(errno)); - return( 1 ); - } + /* 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 ); - /* First pass: count number of lines */ - for( i_index = 0; fgets( psz_line, INTF_MAX_CMD_SIZE, p_file ) != NULL; i_index++ ) + /* Cleanup the interfaces */ + for( intf_thread_t *p_intf = p_first; p_intf != NULL; ) { - ; - } + intf_thread_t *p_next = p_intf->p_next; - if( i_index != 0 ) - { - /* Allocate array and rewind - some of the lines may be invalid, and the - * array will probably be larger than the actual number of channels, but - * it has no consequence. */ - p_intf->p_channel = malloc( sizeof( intf_channel_t ) * i_index ); - if( p_intf->p_channel == NULL ) - { - intf_ErrMsg("error: %s\n", strerror(ENOMEM)); - fclose( p_file ); - return( 1 ); - } - p_channel = p_intf->p_channel; - rewind( p_file ); + 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 ); - /* Second pass: read channels descriptions */ - while( fgets( psz_line, INTF_MAX_CMD_SIZE, p_file ) != NULL ) - { - if( !ParseChannel( p_channel, psz_line ) ) - { - intf_DbgMsg( "channel [%d] %s : method %d (%s:%d vlan %d)\n", - p_channel->i_channel, p_channel->psz_description, - p_channel->i_input_method, - p_channel->psz_input_source, - p_channel->i_input_port, p_channel->i_input_vlan ); - p_channel++; - } - } - - /* Add marker at the end of the array */ - p_channel->i_channel = -1; + p_intf = p_next; } - - /* Close file */ - fclose( p_file ); - return( 0 ); } -/***************************************************************************** - * UnloadChannels: unload channels description - ***************************************************************************** - * This function free all resources allocated by LoadChannels, if any. - *****************************************************************************/ -static void UnloadChannels( intf_thread_t *p_intf ) -{ - int i_channel; /* channel index */ +/* Following functions are local */ - if( p_intf->p_channel != NULL ) - { - /* Free allocated strings */ - for( i_channel = 0; - p_intf->p_channel[ i_channel ].i_channel != -1; - i_channel++ ) - { - if( p_intf->p_channel[ i_channel ].psz_description != NULL ) - { - free( p_intf->p_channel[ i_channel ].psz_description ); - } - if( p_intf->p_channel[ i_channel ].psz_input_source != NULL ) - { - free( p_intf->p_channel[ i_channel ].psz_input_source ); - } - } +/** + * 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; - /* Free array */ - free( p_intf->p_channel ); - p_intf->p_channel = NULL; - } + p_intf->pf_run( p_intf ); + return NULL; } - -/***************************************************************************** - * ParseChannel: parse a channel description line - ***************************************************************************** - * See LoadChannels. This function return non 0 on parsing error. - *****************************************************************************/ -static int ParseChannel( intf_channel_t *p_channel, char *psz_str ) +#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 ) { - char * psz_index; /* current character */ - char * psz_end; /* end pointer for strtol */ - int i_field; /* field number, -1 on error */ - int i_field_length; /* field length, for text fields */ - - /* Set some default fields */ - p_channel->i_channel = 0; - p_channel->psz_description = NULL; - p_channel->i_input_method = 0; - p_channel->psz_input_source = NULL; - p_channel->i_input_port = 0; - p_channel->i_input_vlan = 0; - - /* Parse string */ - i_field = 0; - for( psz_index = psz_str; (i_field != -1) && (*psz_index != '\0'); psz_index++ ) - { - if( *psz_index == ';' ) - { - /* Mark end of field */ - *psz_index = '\0'; - - /* Parse field */ - switch( i_field++ ) - { - case 0: /* channel number */ - p_channel->i_channel = strtol( psz_str, &psz_end, 0); - if( (*psz_str == '\0') || (*psz_end != '\0') ) - { - i_field = -1; - } - break; - case 1: /* channel description */ - i_field_length = strlen( psz_str ); - if( i_field_length != 0 ) - { - p_channel->psz_description = malloc( i_field_length + 1 ); - if( p_channel->psz_description == NULL ) - { - intf_ErrMsg("error: %s\n", strerror( ENOMEM )); - i_field = -1; - } - else - { - strcpy( p_channel->psz_description, psz_str ); - } - } - break; - case 2: /* input method */ - p_channel->i_input_method = strtol( psz_str, &psz_end, 0); - if( (*psz_str == '\0') || (*psz_end != '\0') ) - { - i_field = -1; - } - break; - case 3: /* input source */ - i_field_length = strlen( psz_str ); - if( i_field_length != 0 ) - { - p_channel->psz_input_source = malloc( i_field_length + 1 ); - if( p_channel->psz_input_source == NULL ) - { - intf_ErrMsg("error: %s\n", strerror( ENOMEM )); - i_field = -1; - } - else - { - strcpy( p_channel->psz_input_source, psz_str ); - } - } - break; - case 4: /* input port */ - p_channel->i_input_port = strtol( psz_str, &psz_end, 0); - if( (*psz_str == '\0') || (*psz_end != '\0') ) - { - i_field = -1; - } - break; - case 5: /* input vlan */ - p_channel->i_channel = strtol( psz_str, &psz_end, 0); - if( (*psz_str == '\0') || (*psz_end != '\0') ) - { - i_field = -1; - } - break; - /* ... following fields are ignored */ - } - - /* Set new beginning of field */ - psz_str = psz_index + 1; - } - } + intf_thread_t *p_intf = (intf_thread_t *)p_this; + libvlc_int_t * p_libvlc = p_intf->p_libvlc; + int canc = vlc_savecancel (); - /* At least the first three fields must be parsed sucessfully for function - * success. Other parsing errors are returned using i_field = -1. */ - if( i_field < 3 ) - { - /* Function fails. Free allocated strings */ - if( p_channel->psz_description != NULL ) - { - free( p_channel->psz_description ); - } - if( p_channel->psz_input_source != NULL ) - { - free( p_channel->psz_input_source ); - } - return( 1 ); - } + libvlc_InternalWait( p_libvlc ); - /* Return success */ - return( 0 ); + 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 ) +{ + (void)psz_cmd; (void)oldval; (void)p_data; + char* psz_intf; + + /* 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; }