X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Finterface%2Finterface.c;h=2c06f3d6c187d5fd0c53c618c1ae6ba81a6e28f2;hb=83f23b6686543887f908d184387782bf018c35d5;hp=e46b423cab3252034458260bdefd869fc652db89;hpb=585f8158d042472850386cb3b8b61d0ad4450e53;p=vlc diff --git a/src/interface/interface.c b/src/interface/interface.c index e46b423cab..2c06f3d6c1 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-2004 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,69 +20,59 @@ * * 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 +#include #include "audio_output.h" -#include "intf_msg.h" -#include "interface.h" -#include "intf_cmd.h" -#include "intf_console.h" -#include "keystrokes.h" - -#include "video.h" +#include "vlc_interface.h" +#include "vlc_video.h" #include "video_output.h" -#include "main.h" +#ifdef __APPLE__ +# include +#endif /***************************************************************************** - * 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. + * Local prototypes *****************************************************************************/ -typedef struct intf_channel_s -{ - /* Channel description */ - int i_channel; /* channel number, -1 for end of array */ - char * psz_description; /* channel description (owned) */ +static void Manager( intf_thread_t *p_intf ); +static void RunInterface( intf_thread_t *p_intf ); - /* 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; +static int SwitchIntfCallback( vlc_object_t *, char const *, + vlc_value_t , vlc_value_t , void * ); +static int AddIntfCallback( vlc_object_t *, char const *, + vlc_value_t , vlc_value_t , void * ); +#ifdef __APPLE__ /***************************************************************************** - * Local prototypes + * VLCApplication interface *****************************************************************************/ -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 ); +@interface VLCApplication : NSApplication +{ + vlc_t *o_vlc; +} + +- (void)setVLC: (vlc_t *)p_vlc; + +@end +#endif /***************************************************************************** * intf_Create: prepare interface before main loop @@ -89,641 +80,420 @@ static int ParseChannel ( intf_channel_t *p_channel, char *psz_str ); * 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. + * You can give some additional options to be used for interface initialization + * + * \param p_this the calling vlc_object_t + * \param psz_module a prefered interface module + * \param i_options number additional options + * \param ppsz_options additional option strings + * \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, + int i_options, char **ppsz_options ) { 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; + int i; /* Allocate structure */ - p_intf = malloc( sizeof( intf_thread_t ) ); + p_intf = vlc_object_create( p_this, VLC_OBJECT_INTF ); if( !p_intf ) { - intf_ErrMsg("error: %s\n", strerror( ENOMEM ) ); - return( NULL ); + msg_Err( p_this, "out of memory" ); + return NULL; } + p_intf->pf_request_window = NULL; + p_intf->pf_release_window = NULL; + p_intf->pf_control_window = NULL; + p_intf->b_play = VLC_FALSE; + p_intf->b_interaction = VLC_FALSE; - /* Get a suitable interface plugin */ - for( i_index = 0 ; i_index < p_main->p_bank->i_plugin_count ; i_index++ ) + for( i = 0 ; i< i_options; i++ ) { - /* 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; - } - } - } + var_OptionParse( p_intf, ppsz_options[i] ); } - if( i_best_score == 0 ) + /* Choose the best module */ + p_intf->p_module = module_Need( p_intf, "interface", psz_module, VLC_FALSE ); + + if( p_intf->p_module == NULL ) { - free( p_intf ); - return( NULL ); + msg_Err( p_intf, "no suitable interface module" ); + vlc_object_destroy( 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 ); - } + p_intf->b_menu = VLC_FALSE; + p_intf->b_menu_change = VLC_FALSE; + + /* Initialize mutexes */ + vlc_mutex_init( p_intf, &p_intf->change_lock ); + + /* Attach interface to its parent object */ + vlc_object_attach( p_intf, p_this ); - intf_Msg("Interface initialized\n"); - return( p_intf ); + return p_intf; } /***************************************************************************** - * intf_Run + * intf_RunThread: launch the interface thread ***************************************************************************** - * Initialization script and main interface loop. + * 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. *****************************************************************************/ -void intf_Run( intf_thread_t *p_intf ) +/** + * 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 ) { - char * psz_server = main_GetPszVariable( INPUT_SERVER_VAR, NULL ); +#ifdef __APPLE__ + NSAutoreleasePool * o_pool; - /* If a server was specified */ - if( psz_server ) + if( p_intf->b_block ) { - p_intf->p_input = input_CreateThread( INPUT_METHOD_TS_UCAST, - psz_server, 0, 0, - p_intf->p_vout, p_main->p_aout, NULL ); + /* This is the primary intf */ + /* Run a manager thread, launch the interface, kill the manager */ + if( vlc_thread_create( p_intf, "manage", Manager, + VLC_THREAD_PRIORITY_LOW, VLC_FALSE ) ) + { + msg_Err( p_intf, "cannot spawn manager thread" ); + return VLC_EGENERIC; + } } - /* Or if a file was specified */ - else if( p_main->p_playlist->p_list ) + + if( p_intf->b_block && strncmp( p_intf->p_vlc->psz_object_name, + "clivlc", 6) ) { - p_intf->p_input = input_CreateThread( INPUT_METHOD_TS_FILE, NULL, 0, 0, p_main->p_intf->p_vout, p_main->p_aout, NULL ); + o_pool = [[NSAutoreleasePool alloc] init]; + [VLCApplication sharedApplication]; + [NSApp setVLC: p_intf->p_vlc]; } - /* 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 ) + + if( p_intf->b_block && + ( !strncmp( p_intf->p_module->psz_object_name, "macosx" , 6 ) || + !strncmp( p_intf->p_vlc->psz_object_name, "clivlc", 6 ) ) ) { - intf_ErrMsg("warning: error(s) during startup script\n"); + /* VLC in normal primary interface mode */ + RunInterface( p_intf ); + p_intf->b_die = VLC_TRUE; } - - /* Main loop */ - while(!p_intf->b_die) + else { - /* 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 ) + /* Run the interface in a separate thread */ + if( !strcmp( p_intf->p_module->psz_object_name, "macosx" ) ) { - /* FIXME: add aout error detection ?? */ - p_intf->b_die = 1; + msg_Err( p_intf, "You cannot run the MacOS X module as an " + "extra interface. Please read the " + "README.MacOSX.rtf file."); + return VLC_EGENERIC; } - if( (p_intf->p_input != NULL) && p_intf->p_input->b_error ) + if( vlc_thread_create( p_intf, "interface", RunInterface, + VLC_THREAD_PRIORITY_LOW, VLC_FALSE ) ) { - input_DestroyThread( p_intf->p_input, NULL ); - p_intf->p_input = NULL; - intf_DbgMsg("Input thread destroyed\n"); + msg_Err( p_intf, "cannot spawn interface thread" ); + return VLC_EGENERIC; } - /* 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 ); + if( p_intf->b_block ) + { + /* VLC in primary interface mode with a working macosx vout */ + [NSApp run]; + p_intf->b_die = VLC_TRUE; + } } -} - -/***************************************************************************** - * 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) +#else + if( p_intf->b_block ) { - p_next = p_cur->next; - free(p_cur); - p_cur = p_next; - } - - - /* Free structure */ - free( p_intf ); -} + /* Run a manager thread, launch the interface, kill the manager */ + if( vlc_thread_create( p_intf, "manager", Manager, + VLC_THREAD_PRIORITY_LOW, VLC_FALSE ) ) + { + msg_Err( p_intf, "cannot spawn manager thread" ); + return VLC_EGENERIC; + } -/***************************************************************************** - * 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 */ + RunInterface( p_intf ); - /* Look for channel in array */ - if( p_intf->p_channel != NULL ) + p_intf->b_die = VLC_TRUE; + /* Do not join the thread... intf_StopThread will do it for us */ + } + else { - for( p_channel = p_intf->p_channel; p_channel->i_channel != -1; p_channel++ ) + /* Run the interface in a separate thread */ + if( vlc_thread_create( p_intf, "interface", RunInterface, + VLC_THREAD_PRIORITY_LOW, VLC_FALSE ) ) { - 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 ); - } + msg_Err( p_intf, "cannot spawn interface thread" ); + return VLC_EGENERIC; } } +#endif - /* Channel does not exist */ - intf_Msg("Channel %d does not exist\n", i_channel ); - return( 1 ); + return VLC_SUCCESS; } -/***************************************************************************** - * 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) +/** + * 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 ) { - p_intf_key p_cur = p_intf->p_keys; - if( p_cur == NULL ) + /* Tell the interface to die */ + if( !p_intf->b_block ) { - 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; - } + p_intf->b_die = VLC_TRUE; + } + + /* Wait for the thread to exit */ + vlc_thread_join( p_intf ); } -/* 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 = INTF_KEY_UNKNOWN; - reply.param = 0; - } - else +/** + * \brief Destroy the interface after the main loop endeed. + * + * Destroys interfaces and closes output devices + * \param p_intf the interface thread + * \return nothing + */ +void intf_Destroy( intf_thread_t *p_intf ) +{ + /* Unlock module if present (a switch may have failed) */ + if( p_intf->p_module ) { - reply.key = current->forwarded.key; - reply.param = current->forwarded.param; + module_Unneed( p_intf, p_intf->p_module ); } - return reply; + + vlc_mutex_destroy( &p_intf->change_lock ); + + /* Free structure */ + vlc_object_destroy( p_intf ); } -/***************************************************************************** -* 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_get_key = intf_GetKey; - - intf_AssignKey( p_intf , 'Q', INTF_KEY_QUIT, 0); - intf_AssignKey( p_intf , 'q', INTF_KEY_QUIT, 0); - intf_AssignKey( p_intf , 27, INTF_KEY_QUIT, 0); - intf_AssignKey( p_intf , 3, INTF_KEY_QUIT, 0); - intf_AssignKey( p_intf , '0', INTF_KEY_SET_CHANNEL, 0); - intf_AssignKey( p_intf , '1', INTF_KEY_SET_CHANNEL, 1); - intf_AssignKey( p_intf , '2', INTF_KEY_SET_CHANNEL, 2); - intf_AssignKey( p_intf , '3', INTF_KEY_SET_CHANNEL, 3); - intf_AssignKey( p_intf , '4', INTF_KEY_SET_CHANNEL, 4); - intf_AssignKey( p_intf , '5', INTF_KEY_SET_CHANNEL, 5); - intf_AssignKey( p_intf , '6', INTF_KEY_SET_CHANNEL, 6); - intf_AssignKey( p_intf , '7', INTF_KEY_SET_CHANNEL, 7); - intf_AssignKey( p_intf , '8', INTF_KEY_SET_CHANNEL, 8); - intf_AssignKey( p_intf , '9', INTF_KEY_SET_CHANNEL, 9); - intf_AssignKey( p_intf , '0', INTF_KEY_SET_CHANNEL, 0); - intf_AssignKey( p_intf , '+', INTF_KEY_INC_VOLUME, 0); - intf_AssignKey( p_intf , '-', INTF_KEY_DEC_VOLUME, 0); - intf_AssignKey( p_intf , 'm', INTF_KEY_TOGGLE_VOLUME, 0); - intf_AssignKey( p_intf , 'M', INTF_KEY_TOGGLE_VOLUME, 0); - intf_AssignKey( p_intf , 'g', INTF_KEY_DEC_GAMMA, 0); - intf_AssignKey( p_intf , 'G', INTF_KEY_INC_GAMMA, 0); - intf_AssignKey( p_intf , 'c', INTF_KEY_TOGGLE_GRAYSCALE, 0); - intf_AssignKey( p_intf , ' ', INTF_KEY_TOGGLE_INTERFACE, 0); - intf_AssignKey( p_intf , 'i', INTF_KEY_TOGGLE_INFO, 0); - intf_AssignKey( p_intf , 's', INTF_KEY_TOGGLE_SCALING, 0); -} +/* Following functions are local */ /***************************************************************************** - * intf_ProcessKey: process standard keys + * Manager: helper thread for blocking interfaces ***************************************************************************** - * This function will process standard keys and return non 0 if the key was - * unknown. + * 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. *****************************************************************************/ -int intf_ProcessKey( intf_thread_t *p_intf, int g_key ) +/** + * \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 ) { - static int i_volbackup; - keyparm k_reply; - - k_reply = intf_GetKey( p_intf, g_key); - - switch( k_reply.key ) + while( !p_intf->b_die ) { - case INTF_KEY_QUIT: /* quit order */ - p_intf->b_die = 1; - break; - case INTF_KEY_SET_CHANNEL: - /* Change channel - return code is ignored since SelectChannel displays - * its own error messages */ - intf_SelectChannel( p_intf, k_reply.param - '0' ); - break; - case INTF_KEY_INC_VOLUME: /* volume + */ - if( (p_main->p_aout != NULL) && (p_main->p_aout->vol < VOLMAX) ) - p_main->p_aout->vol += VOLSTEP; - break; - case INTF_KEY_DEC_VOLUME: /* volume - */ - if( (p_main->p_aout != NULL) && (p_main->p_aout->vol > VOLSTEP) ) - p_main->p_aout->vol -= VOLSTEP; - break; - case INTF_KEY_TOGGLE_VOLUME: /* 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 INTF_KEY_DEC_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 INTF_KEY_INC_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 INTF_KEY_TOGGLE_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 INTF_KEY_TOGGLE_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 INTF_KEY_TOGGLE_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 INTF_KEY_TOGGLE_SCALING: /* toggle scaling */ - if( p_intf->p_vout != NULL ) + msleep( INTF_IDLE_SLEEP ); + + if( p_intf->p_vlc->b_die ) { - 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 ); + p_intf->b_die = VLC_TRUE; +#ifdef __APPLE__ + if( strncmp( p_intf->p_vlc->psz_object_name, "clivlc", 6 ) ) + { + [NSApp stop: NULL]; + } +#endif + return; } - break; - default: /* unknown key */ - return( 1 ); } - - return( 0 ); } -/* 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. + * RunInterface: setups necessary data and give control to the interface *****************************************************************************/ -static int LoadChannels( intf_thread_t *p_intf, char *psz_filename ) +static void RunInterface( intf_thread_t *p_intf ) { - 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 */ - - /* Set default value */ - p_intf->p_channel = NULL; - - /* FIXME: channels are disabled */ - return( 0 ); - - /* Open file */ - p_file = fopen( psz_filename, "r" ); - if( p_file == NULL ) + static char *ppsz_interfaces[] = { - intf_ErrMsg("error: can't open %s (%s)\n", psz_filename, strerror(errno)); - return( 1 ); - } - - /* First pass: count number of lines */ - for( i_index = 0; fgets( psz_line, INTF_MAX_CMD_SIZE, p_file ) != NULL; i_index++ ) - { - ; - } - - if( i_index != 0 ) + "skins2", "Skins 2", +#ifndef WIN32 + "wxwidgets", "wxWidgets", +#endif + NULL, NULL + }; + char **ppsz_parser; + + vlc_list_t *p_list; + int i; + vlc_value_t val, text; + char *psz_intf; + + /* 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 ); + + /* Only fill the list with available modules */ + p_list = vlc_list_find( p_intf, VLC_OBJECT_MODULE, FIND_ANYWHERE ); + for( ppsz_parser = ppsz_interfaces; *ppsz_parser; ppsz_parser += 2 ) { - /* 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 ) + for( i = 0; i < p_list->i_count; i++ ) { - intf_ErrMsg("error: %s\n", strerror(ENOMEM)); - fclose( p_file ); - return( 1 ); + module_t *p_module = (module_t *)p_list->p_values[i].p_object; + if( !strcmp( p_module->psz_object_name, ppsz_parser[0] ) ) + { + val.psz_string = ppsz_parser[0]; + text.psz_string = ppsz_parser[1]; + var_Change( p_intf, "intf-switch", VLC_VAR_ADDCHOICE, + &val, &text ); + break; + } } - p_channel = p_intf->p_channel; - rewind( p_file ); + } + vlc_list_release( p_list ); + + 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 = "telnet"; text.psz_string = "Telnet Interface"; + var_Change( p_intf, "intf-add", VLC_VAR_ADDCHOICE, &val, &text ); + val.psz_string = "http"; text.psz_string = "Web Interface"; + 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 = "gestures"; text.psz_string = "Mouse Gestures"; + var_Change( p_intf, "intf-add", VLC_VAR_ADDCHOICE, &val, &text ); + + var_AddCallback( p_intf, "intf-add", AddIntfCallback, NULL ); + + do + { + /* Give control to the interface */ + p_intf->pf_run( p_intf ); + + /* Reset play on start status */ + p_intf->b_play = VLC_FALSE; - /* Second pass: read channels descriptions */ - while( fgets( psz_line, INTF_MAX_CMD_SIZE, p_file ) != NULL ) + if( !p_intf->psz_switch_intf ) { - 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++; - } + break; } - /* Add marker at the end of the array */ - p_channel->i_channel = -1; - } + /* Make sure the old interface is completely uninitialized */ + module_Unneed( p_intf, p_intf->p_module ); - /* Close file */ - fclose( p_file ); - return( 0 ); + /* Provide ability to switch the main interface on the fly */ + psz_intf = p_intf->psz_switch_intf; + p_intf->psz_switch_intf = NULL; + + vlc_mutex_lock( &p_intf->object_lock ); + p_intf->b_die = VLC_FALSE; + p_intf->b_dead = VLC_FALSE; + vlc_mutex_unlock( &p_intf->object_lock ); + + p_intf->p_module = module_Need( p_intf, "interface", psz_intf, 0 ); + free( psz_intf ); + } + while( p_intf->p_module ); } -/***************************************************************************** - * UnloadChannels: unload channels description - ***************************************************************************** - * This function free all resources allocated by LoadChannels, if any. - *****************************************************************************/ -static void UnloadChannels( intf_thread_t *p_intf ) +static int SwitchIntfCallback( vlc_object_t *p_this, char const *psz_cmd, + vlc_value_t oldval, vlc_value_t newval, void *p_data ) { - int i_channel; /* channel index */ + intf_thread_t *p_intf = (intf_thread_t *)p_this; + + 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; + + return VLC_SUCCESS; +} - if( p_intf->p_channel != NULL ) +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") ); + + /* Try to create the interface */ + sprintf( psz_intf, "%s,none", newval.psz_string ); + p_intf = intf_Create( p_this->p_vlc, psz_intf, 0, NULL ); + free( psz_intf ); + if( p_intf == 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 ); - } - } + msg_Err( p_this, "interface \"%s\" initialization failed", + newval.psz_string ); + return VLC_EGENERIC; + } - /* Free array */ - free( p_intf->p_channel ); - p_intf->p_channel = NULL; + /* 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; +} +#ifdef __APPLE__ /***************************************************************************** - * ParseChannel: parse a channel description line - ***************************************************************************** - * See LoadChannels. This function return non 0 on parsing error. + * VLCApplication implementation *****************************************************************************/ -static int ParseChannel( intf_channel_t *p_channel, char *psz_str ) +@implementation VLCApplication + +- (void)setVLC: (vlc_t *) p_vlc { - 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'; + o_vlc = p_vlc; +} - /* 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 */ - } +- (void)stop: (id)sender +{ + NSEvent *o_event; + NSAutoreleasePool *o_pool; + [super stop:sender]; + + o_pool = [[NSAutoreleasePool alloc] init]; + /* send a dummy event to break out of the event loop */ + o_event = [NSEvent mouseEventWithType: NSLeftMouseDown + location: NSMakePoint( 1, 1 ) modifierFlags: 0 + timestamp: 1 windowNumber: [[NSApp mainWindow] windowNumber] + context: [NSGraphicsContext currentContext] eventNumber: 1 + clickCount: 1 pressure: 0.0]; + [NSApp postEvent: o_event atStart: YES]; + [o_pool release]; +} - /* Set new beginning of field */ - psz_str = psz_index + 1; - } - } +- (void)terminate: (id)sender +{ + o_vlc->b_die = VLC_TRUE; +} - /* 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 ); - } +@end +#endif - /* Return success */ - return( 0 ); -}