* 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 GNU
- * General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
- * 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-1307, USA.
+ * 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.
*****************************************************************************/
/*****************************************************************************
* Preamble
*****************************************************************************/
+#include "defs.h"
+
#include <errno.h> /* ENOMEM */
#include <stdlib.h> /* free(), strtol() */
#include <stdio.h> /* FILE */
#include <string.h> /* strerror() */
-#include <sys/types.h> /* on BSD, uio.h needs types.h */
-#include <sys/uio.h> /* for input.h */
#include "config.h"
#include "common.h"
-#include "mtime.h"
#include "threads.h"
+#include "mtime.h"
#include "plugins.h"
-#include "input.h"
+#include "playlist.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 "keystrokes.h"
#include "video.h"
#include "video_output.h"
int i_input_method; /* input method descriptor */
char * psz_input_source; /* source string (owned) */
int i_input_port; /* port */
- int i_input_vlan; /* vlan */
+ int i_input_vlan_id; /* vlan id */
} intf_channel_t;
/*****************************************************************************
*****************************************************************************/
intf_thread_t* intf_Create( void )
{
- intf_thread_t *p_intf;
- char * psz_method;
+ 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("error: %s", strerror( ENOMEM ) );
return( NULL );
}
- /* Request an interface plugin */
- psz_method = main_GetPszVariable( VOUT_METHOD_VAR, VOUT_DEFAULT_METHOD );
- p_intf->p_intf_plugin = RequestPlugin( "intf", psz_method );
+ /* Get a suitable interface plugin */
+ for( i_index = 0 ; i_index < p_main->p_bank->i_plugin_count ; i_index++ )
+ {
+ /* 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;
+ }
+ }
+ }
+ }
- if( !p_intf->p_intf_plugin )
+ if( i_best_score == 0 )
{
- intf_ErrMsg( "error: could not open interface plugin intf_%s.so\n", psz_method );
free( p_intf );
+ intf_ErrMsg( "error: no suitable plugin to create interface" );
return( NULL );
}
- /* Get plugins */
- p_intf->p_sys_create = GetPluginFunction( p_intf->p_intf_plugin, "intf_SysCreate" );
- p_intf->p_sys_manage = GetPluginFunction( p_intf->p_intf_plugin, "intf_SysManage" );
- p_intf->p_sys_destroy = GetPluginFunction( p_intf->p_intf_plugin, "intf_SysDestroy" );
+ /* 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;
+ /* Warning level initialisation */
+ p_intf->i_warning_level = main_GetIntVariable( INTF_WARNING_VAR, INTF_WARNING_DEFAULT );
+
/* Load channels - the pointer will be set to NULL on failure. The
* return value is ignored since the program can work without
* channels */
p_intf->p_console = intf_ConsoleCreate();
if( p_intf->p_console == NULL )
{
- intf_ErrMsg("error: can't create control console\n");
- TrashPlugin( p_intf->p_intf_plugin );
+ intf_ErrMsg("error: can't create control console");
free( p_intf );
return( NULL );
}
if( p_intf->p_sys_create( p_intf ) )
{
- intf_ErrMsg("error: can't create interface\n");
+ intf_ErrMsg("error: can't create interface");
intf_ConsoleDestroy( p_intf->p_console );
- TrashPlugin( p_intf->p_intf_plugin );
free( p_intf );
return( NULL );
}
- intf_Msg("Interface initialized\n");
+ intf_Msg("Interface initialized");
return( p_intf );
}
*****************************************************************************/
void intf_Run( intf_thread_t *p_intf )
{
+ char * psz_server = main_GetPszVariable( INPUT_SERVER_VAR, NULL );
+ input_config_t * p_input_config;
+
+ /* Flush messages before spawning input */
+ intf_FlushMsg();
+
+ /* If a server was specified */
+ if( psz_server )
+ {
+ if( (p_input_config =
+ (input_config_t *)malloc( sizeof(input_config_t) )) == NULL )
+ {
+ intf_ErrMsg("Out of memory");
+ }
+ else
+ {
+ p_input_config->i_method = INPUT_METHOD_UCAST;
+ p_input_config->p_source = psz_server;
+ p_input_config->p_default_aout = p_main->p_aout;
+ p_input_config->p_default_vout = p_intf->p_vout;
+
+ p_intf->p_input = input_CreateThread( p_input_config, NULL );
+ }
+ }
+ /* Or if a file was specified */
+ else if( p_main->p_playlist->p_list != NULL )
+ {
+ if( (p_input_config =
+ (input_config_t *)malloc( sizeof(input_config_t) )) == NULL )
+ {
+ intf_ErrMsg("Out of memory");
+ }
+ else
+ {
+ p_input_config->i_method = INPUT_METHOD_FILE;
+ p_input_config->p_source = p_main->p_playlist->p_list[0]; /* FIXME ??? */
+ p_input_config->p_default_aout = p_main->p_aout;
+ p_input_config->p_default_vout = p_intf->p_vout;
+
+ p_intf->p_input = input_CreateThread( p_input_config, NULL );
+ }
+ }
/* Execute the initialization script - if a positive number is returned,
* the script could be executed but failed */
- if( intf_ExecScript( main_GetPszVariable( INTF_INIT_SCRIPT_VAR, INTF_INIT_SCRIPT_DEFAULT ) ) > 0 )
+ else if( intf_ExecScript( main_GetPszVariable( INTF_INIT_SCRIPT_VAR, INTF_INIT_SCRIPT_DEFAULT ) ) > 0 )
{
- intf_ErrMsg("warning: error(s) during startup script\n");
+ intf_ErrMsg("warning: error(s) during startup script");
}
/* Main loop */
{
input_DestroyThread( p_intf->p_input, NULL );
p_intf->p_input = NULL;
- intf_DbgMsg("Input thread destroyed\n");
+ intf_DbgMsg("Input thread destroyed");
}
/* Sleep to avoid using all CPU - since some interfaces needs to access
*****************************************************************************/
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 );
- /* Close plugin */
- TrashPlugin( p_intf->p_intf_plugin );
-
- /* Free structure */
+ /* 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 );
}
*****************************************************************************/
int intf_SelectChannel( intf_thread_t * p_intf, int i_channel )
{
+ /* FIXME */
+#if 0
intf_channel_t * p_channel; /* channel */
/* Look for channel in array */
{
if( p_channel->i_channel == i_channel )
{
- /*
- * Change channel
- */
+ /*
+ * Change channel
+ */
- /* Kill existing input, if any */
- if( p_intf->p_input != NULL )
- {
- input_DestroyThread( p_intf->p_input, NULL );
- }
+ /* 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 );
+ intf_Msg("Channel %d: %s", 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 );
+ /* 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_id,
+ 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 );
+ intf_Msg("Channel %d does not exist", i_channel );
+#endif
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;
+ }
+}
+
+/* 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_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 i_key )
+int intf_ProcessKey( intf_thread_t *p_intf, int g_key )
{
- switch( i_key )
+ static int i_volbackup;
+ keyparm k_reply;
+
+ k_reply = intf_GetKey( p_intf, g_key);
+
+ switch( k_reply.key )
{
- case 'Q': /* quit order */
- case 'q':
- case 27: /* escape key */
- case 3: /* ^C */
+ case INTF_KEY_QUIT: /* quit order */
p_intf->b_die = 1;
break;
- case '0': /* source change */
- case '1':
- case '2':
- case '3':
- case '4':
- case '5':
- case '6':
- case '7':
- case '8':
- case '9':
+ case INTF_KEY_SET_CHANNEL:
/* Change channel - return code is ignored since SelectChannel displays
* its own error messages */
- intf_SelectChannel( p_intf, i_key - '0' );
+ intf_SelectChannel( p_intf, k_reply.param );
break;
- case '+': /* volume + */
- /* XXX?? */
+ case INTF_KEY_INC_VOLUME: /* volume + */
+ if( (p_main->p_aout != NULL) && (p_main->p_aout->vol < VOLUME_MAX) )
+ p_main->p_aout->vol += VOLUME_STEP;
break;
- case '-': /* volume - */
- /* XXX?? */
+ case INTF_KEY_DEC_VOLUME: /* volume - */
+ if( (p_main->p_aout != NULL) && (p_main->p_aout->vol > VOLUME_STEP) )
+ p_main->p_aout->vol -= VOLUME_STEP;
break;
- case 'M': /* toggle mute */
- case 'm':
- /* XXX?? */
+ 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 'g': /* gamma - */
+ 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 );
vlc_mutex_unlock( &p_intf->p_vout->change_lock );
}
break;
- case 'G': /* gamma + */
+ 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 );
vlc_mutex_unlock( &p_intf->p_vout->change_lock );
}
break;
- case 'c': /* toggle grayscale */
+ case INTF_KEY_TOGGLE_GRAYSCALE: /* toggle grayscale */
if( p_intf->p_vout != NULL )
{
vlc_mutex_lock( &p_intf->p_vout->change_lock );
vlc_mutex_unlock( &p_intf->p_vout->change_lock );
}
break;
- case ' ': /* toggle interface */
+ case INTF_KEY_TOGGLE_INTERFACE: /* toggle interface */
if( p_intf->p_vout != NULL )
{
vlc_mutex_lock( &p_intf->p_vout->change_lock );
vlc_mutex_unlock( &p_intf->p_vout->change_lock );
}
break;
- case 'i': /* toggle info */
+ case INTF_KEY_TOGGLE_INFO: /* toggle info */
if( p_intf->p_vout != NULL )
{
vlc_mutex_lock( &p_intf->p_vout->change_lock );
vlc_mutex_unlock( &p_intf->p_vout->change_lock );
}
break;
- case 's': /* toggle scaling */
+ case INTF_KEY_TOGGLE_SCALING: /* toggle scaling */
if( p_intf->p_vout != NULL )
{
vlc_mutex_lock( &p_intf->p_vout->change_lock );
* integer input method (see input.h)
* string input source
* integer input port
- * integer input vlan
+ * integer input vlan id
* 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.
/* 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 )
{
- intf_ErrMsg("error: can't open %s (%s)\n", psz_filename, strerror(errno));
+ intf_ErrMsg("error: can't open %s (%s)", psz_filename, strerror(errno));
return( 1 );
}
p_intf->p_channel = malloc( sizeof( intf_channel_t ) * i_index );
if( p_intf->p_channel == NULL )
{
- intf_ErrMsg("error: %s\n", strerror(ENOMEM));
+ intf_ErrMsg("error: %s", strerror(ENOMEM));
fclose( p_file );
return( 1 );
}
{
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 );
+ intf_DbgMsg( "channel [%d] %s : method %d (%s:%d vlan id %d)",
+ 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_id );
p_channel++;
}
}
p_channel->i_input_method = 0;
p_channel->psz_input_source = NULL;
p_channel->i_input_port = 0;
- p_channel->i_input_vlan = 0;
+ p_channel->i_input_vlan_id = 0;
/* Parse string */
i_field = 0;
p_channel->psz_description = malloc( i_field_length + 1 );
if( p_channel->psz_description == NULL )
{
- intf_ErrMsg("error: %s\n", strerror( ENOMEM ));
+ intf_ErrMsg("error: %s", strerror( ENOMEM ));
i_field = -1;
}
else
p_channel->psz_input_source = malloc( i_field_length + 1 );
if( p_channel->psz_input_source == NULL )
{
- intf_ErrMsg("error: %s\n", strerror( ENOMEM ));
+ intf_ErrMsg("error: %s", strerror( ENOMEM ));
i_field = -1;
}
else
i_field = -1;
}
break;
- case 5: /* input vlan */
- p_channel->i_channel = strtol( psz_str, &psz_end, 0);
+ case 5: /* input vlan id */
+ p_channel->i_input_vlan_id = strtol( psz_str, &psz_end, 0);
if( (*psz_str == '\0') || (*psz_end != '\0') )
{
i_field = -1;
projects / vlc / blobdiff