X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Finterface%2Finterface.c;h=b627e8c2a367bb12d46b25860240a24936e853d5;hb=a70f8bb371466209770c4c3bcdb7137b94acef66;hp=218cfe3a8a1e077972691af0df191d0e1b5e6984;hpb=0765875ab57be4156314514c4d71577a6a4ca1d0;p=vlc diff --git a/src/interface/interface.c b/src/interface/interface.c index 218cfe3a8a..b627e8c2a3 100644 --- a/src/interface/interface.c +++ b/src/interface/interface.c @@ -4,8 +4,9 @@ * interface, such as command line. ***************************************************************************** * Copyright (C) 1998, 1999, 2000 VideoLAN + * $Id: interface.c,v 1.75 2001/05/01 04:18:18 sam Exp $ * - * 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 @@ -31,23 +32,23 @@ #include /* free(), strtol() */ #include /* FILE */ #include /* strerror() */ -#include /* on BSD, uio.h needs types.h */ -#include /* for input.h */ +#include /* off_t */ #include "config.h" #include "common.h" #include "threads.h" #include "mtime.h" -#include "plugins.h" -#include "playlist.h" -#include "input.h" +#include "modules.h" + +#include "stream_control.h" +#include "input_ext-intf.h" #include "audio_output.h" #include "intf_msg.h" #include "interface.h" -#include "intf_cmd.h" -#include "intf_console.h" +#include "intf_playlist.h" +#include "intf_channels.h" #include "keystrokes.h" #include "video.h" @@ -55,33 +56,10 @@ #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) */ - - /* 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; - /***************************************************************************** * 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 ); +static void intf_Manage( intf_thread_t *p_intf ); /***************************************************************************** * intf_Create: prepare interface before main loop @@ -92,641 +70,314 @@ static int ParseChannel ( intf_channel_t *p_channel, char *psz_str ); intf_thread_t* intf_Create( void ) { 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; /* Allocate structure */ p_intf = malloc( sizeof( intf_thread_t ) ); if( !p_intf ) { - intf_ErrMsg("error: %s\n", strerror( ENOMEM ) ); + intf_ErrMsg( "intf error: cannot create interface thread (%s)", + strerror( ENOMEM ) ); return( NULL ); } - /* Get a suitable interface plugin */ - for( i_index = 0 ; i_index < p_main->p_bank->i_plugin_count ; i_index++ ) + /* Choose the best module */ + p_intf->p_module = module_Need( MODULE_CAPABILITY_INTF, NULL ); + + if( p_intf->p_module == NULL ) { - /* 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; - } - } - } + intf_ErrMsg( "intf error: no suitable intf module" ); + free( p_intf ); + return( NULL ); } - 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. - *****************************************************************************/ +#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 -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); -} + /* Initialize callbacks */ + p_intf->pf_manage = intf_Manage; + + /* Initialize structure */ + p_intf->b_die = 0; + + p_intf->p_input = NULL; + p_intf->p_keys = NULL; + p_intf->b_menu = 0; + p_intf->b_menu_change = 0; + + if( p_intf->pf_open( p_intf ) ) + { + intf_ErrMsg("intf error: cannot create interface"); + module_Unneed( p_intf->p_module ); + free( p_intf ); + return( NULL ); + } + + /* Initialize mutexes */ + vlc_mutex_init( &p_intf->change_lock ); + + /* Load channels - the pointer will be set to NULL on failure. The + * return value is ignored since the program can work without + * channels */ + intf_LoadChannels( p_intf, main_GetPszVariable( INTF_CHANNELS_VAR, + INTF_CHANNELS_DEFAULT )); + + intf_Msg("intf: interface initialized"); + return( p_intf ); +} /***************************************************************************** - * intf_ProcessKey: process standard keys + * intf_Manage: manage interface ***************************************************************************** - * This function will process standard keys and return non 0 if the key was - * unknown. + * 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. *****************************************************************************/ -int intf_ProcessKey( intf_thread_t *p_intf, int g_key ) +static void intf_Manage( intf_thread_t *p_intf ) { - static int i_volbackup; - keyparm i_reply; - - i_reply = intf_getKey( p_intf, g_key); - - switch( i_reply.key ) + /* Flush waiting messages */ + intf_FlushMsg(); + + /* Manage module bank */ + module_ManageBank( ); + + if( ( p_intf->p_input != NULL ) && + ( p_intf->p_input->b_error || p_intf->p_input->b_eof ) ) { - 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 ) + input_DestroyThread( p_intf->p_input, NULL ); + p_intf->p_input = NULL; + intf_DbgMsg("Input thread destroyed"); + } + + /* If no stream is being played, try to find one */ + if( p_intf->p_input == NULL && !p_intf->b_die ) + { + /* Select the next playlist item */ + intf_PlaylistNext( p_main->p_playlist ); + + if( p_main->p_playlist->i_index == -1 ) { - 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 ); + /* FIXME: wait for user to add stuff to playlist ? */ +#if 0 + p_intf->b_die = 1; +#endif } - break; - case VLC_SCALING: /* toggle scaling */ - if( p_intf->p_vout != NULL ) + else { - 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->p_input = + input_CreateThread( &p_main->p_playlist->current, NULL ); } - break; - default: /* unknown key */ - return( 1 ); } - - return( 0 ); } -/* following functions are local */ - /***************************************************************************** - * LoadChannels: load channels description from a file + * intf_Destroy: clean interface after main loop ***************************************************************************** - * 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. + * This function destroys specific interfaces and close output devices. *****************************************************************************/ -static int LoadChannels( intf_thread_t *p_intf, char *psz_filename ) +void intf_Destroy( 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 */ + p_intf_key p_cur; + p_intf_key p_next; - /* Set default value */ - p_intf->p_channel = NULL; + /* Unload channels */ + intf_UnloadChannels( p_intf ); - /* FIXME: channels are disabled */ - return( 0 ); + /* Destroy interfaces */ + p_intf->pf_close( p_intf ); - /* 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 ); + /* Close input thread, if any (blocking) */ + if( p_intf->p_input ) + { + input_DestroyThread( p_intf->p_input, NULL ); } - /* First pass: count number of lines */ - for( i_index = 0; fgets( psz_line, INTF_MAX_CMD_SIZE, p_file ) != NULL; i_index++ ) + /* Destroy keymap */ + p_cur = p_intf->p_keys; + while( p_cur != NULL) { - ; + p_next = p_cur->next; + free(p_cur); + p_cur = p_next; } + + /* Unlock module */ + module_Unneed( p_intf->p_module ); - 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 ); + vlc_mutex_destroy( &p_intf->change_lock ); - /* 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; - } - - /* Close file */ - fclose( p_file ); - return( 0 ); + /* Free structure */ + free( p_intf ); } /***************************************************************************** - * UnloadChannels: unload channels description + * intf_AssignKey: assign standartkeys * ***************************************************************************** - * This function free all resources allocated by LoadChannels, if any. - *****************************************************************************/ -static void UnloadChannels( intf_thread_t *p_intf ) + * 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) { - int i_channel; /* channel index */ - - if( p_intf->p_channel != NULL ) + p_intf_key p_cur = p_intf->p_keys; + if( p_cur == NULL ) { - /* Free allocated strings */ - for( i_channel = 0; - p_intf->p_channel[ i_channel ].i_channel != -1; - i_channel++ ) + 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) { - 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 ); - } + 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; + } +} - /* Free array */ - free( p_intf->p_channel ); - p_intf->p_channel = NULL; +/* 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 + { + 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_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); + intf_AssignKey( p_intf , 'd', INTF_KEY_DUMP_STREAM, 0); +} /***************************************************************************** - * ParseChannel: parse a channel description line + * intf_ProcessKey: process standard keys ***************************************************************************** - * See LoadChannels. This function return non 0 on parsing error. + * This function will process standard keys and return non 0 if the key was + * unknown. *****************************************************************************/ -static int ParseChannel( intf_channel_t *p_channel, char *psz_str ) +int intf_ProcessKey( intf_thread_t *p_intf, int g_key ) { - 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++ ) + static int i_volbackup; + keyparm k_reply; + + k_reply = intf_GetKey( p_intf, g_key); + switch( k_reply.key ) { - if( *psz_index == ';' ) + 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 ); */ +/* network_ChannelJoin() */ +/* FIXME : keyboard event is for the time being half handled by the interface + * half handled directly by the plugins. We should decide what to do. */ + break; + case INTF_KEY_INC_VOLUME: /* volume + */ + if( (p_main->p_aout != NULL) && (p_main->p_aout->i_vol < VOLUME_MAX) ) + p_main->p_aout->i_vol += VOLUME_STEP; + break; + case INTF_KEY_DEC_VOLUME: /* volume - */ + if( (p_main->p_aout != NULL) && (p_main->p_aout->i_vol > VOLUME_STEP) ) + p_main->p_aout->i_vol -= VOLUME_STEP; + break; + case INTF_KEY_TOGGLE_VOLUME: /* toggle mute */ + if( (p_main->p_aout != NULL) && (p_main->p_aout->i_vol)) { - /* 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; + i_volbackup = p_main->p_aout->i_vol; + p_main->p_aout->i_vol = 0; } - } - - /* 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 ) + else if( (p_main->p_aout != NULL) && (!p_main->p_aout->i_vol)) + p_main->p_aout->i_vol = i_volbackup; + break; + case INTF_KEY_DEC_GAMMA: /* gamma - */ + if( (p_main->p_vout != NULL) && (p_main->p_vout->f_gamma > -INTF_GAMMA_LIMIT) ) { - free( p_channel->psz_description ); + /* FIXME: we should lock if called from the interface */ + p_main->p_vout->f_gamma -= INTF_GAMMA_STEP; + p_main->p_vout->i_changes |= VOUT_GAMMA_CHANGE; } - if( p_channel->psz_input_source != NULL ) + break; + case INTF_KEY_INC_GAMMA: /* gamma + */ + if( (p_main->p_vout != NULL) && (p_main->p_vout->f_gamma < INTF_GAMMA_LIMIT) ) { - free( p_channel->psz_input_source ); + /* FIXME: we should lock if called from the interface */ + p_main->p_vout->f_gamma += INTF_GAMMA_STEP; + p_main->p_vout->i_changes |= VOUT_GAMMA_CHANGE; } + break; + case INTF_KEY_DUMP_STREAM: + if( p_intf->p_input != NULL ) + { + vlc_mutex_lock( &p_intf->p_input->stream.stream_lock ); + input_DumpStream( p_intf->p_input ); + vlc_mutex_unlock( &p_intf->p_input->stream.stream_lock ); + } + break; + default: /* unknown key */ return( 1 ); } - /* Return success */ return( 0 ); }