* interface, such as command line.
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
- * $Id: interface.c,v 1.82 2001/12/07 18:33:08 sam Exp $
+ * $Id: interface.c,v 1.87 2002/01/09 02:01:14 sam Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
*
/*****************************************************************************
* 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> /* off_t */
-#include "common.h"
-#include "intf_msg.h"
-#include "threads.h"
-#include "mtime.h"
-#include "modules.h"
+#include <videolan/vlc.h>
#include "stream_control.h"
#include "input_ext-intf.h"
#include "interface.h"
#include "intf_playlist.h"
-#include "intf_channels.h"
-#include "keystrokes.h"
#include "video.h"
#include "video_output.h"
}
/* Choose the best module */
- p_intf->p_module = module_Need( MODULE_CAPABILITY_INTF, NULL );
+ p_intf->p_module = module_Need( MODULE_CAPABILITY_INTF,
+ main_GetPszVariable( INTF_METHOD_VAR, NULL ),
+ NULL );
if( p_intf->p_module == NULL )
{
/* 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;
/* 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_WarnMsg( 1, "intf: interface initialized");
return( p_intf );
}
/* Manage module bank */
module_ManageBank( );
- if( ( p_intf->p_input != NULL ) &&
- ( p_intf->p_input->b_error || p_intf->p_input->b_eof ) )
+ vlc_mutex_lock( &p_input_bank->lock );
+
+ if( p_input_bank->i_count )
{
- input_DestroyThread( p_intf->p_input, NULL );
- p_intf->p_input = NULL;
- intf_DbgMsg("Input thread destroyed");
- }
+ int i_input;
+ input_thread_t *p_input;
+
+ for( i_input = 0; i_input < p_input_bank->i_count; i_input++ )
+ {
+ p_input = p_input_bank->pp_input[i_input];
+
+ if( p_input->i_status == THREAD_OVER )
+ {
+ /* XXX: completely stupid ! */
+ input_DestroyThread( p_input );
+ p_input_bank->pp_input[i_input] = NULL;
+ p_input_bank->i_count--;
+ }
+ else if( ( p_input->i_status == THREAD_READY
+ || p_input->i_status == THREAD_ERROR )
+ && ( p_input->b_error || p_input->b_eof ) )
+ {
+ input_StopThread( p_input, NULL );
+ }
+ }
+ }
/* If no stream is being played, try to find one */
- if( p_intf->p_input == NULL && !p_intf->b_die )
+ else
{
// vlc_mutex_lock( &p_main->p_playlist->change_lock );
}
else
{
+ input_thread_t *p_input;
+
p_main->p_playlist->b_stopped = 0;
p_main->p_playlist->i_mode = PLAYLIST_FORWARD +
main_GetIntVariable( PLAYLIST_LOOP_VAR,
PLAYLIST_LOOP_DEFAULT );
- p_intf->p_input =
- input_CreateThread( &p_main->p_playlist->current, NULL );
+ intf_WarnMsg( 3, "intf: creating new input thread" );
+ p_input = input_CreateThread( &p_main->p_playlist->current,
+ NULL );
+ if( p_input != NULL )
+ {
+ p_input_bank->pp_input[ p_input_bank->i_count ] = p_input;
+ p_input_bank->i_count++;
+ }
}
}
else
// vlc_mutex_unlock( &p_main->p_playlist->change_lock );
}
+
+ vlc_mutex_unlock( &p_input_bank->lock );
}
/*****************************************************************************
*****************************************************************************/
void intf_Destroy( intf_thread_t *p_intf )
{
- p_intf_key p_cur;
- p_intf_key p_next;
-
- /* Unload channels */
- intf_UnloadChannels( p_intf );
-
/* Destroy interfaces */
p_intf->pf_close( p_intf );
+#if 0
/* Close input thread, if any (blocking) */
if( p_intf->p_input )
{
input_DestroyThread( p_intf->p_input, NULL );
}
+#endif
- /* 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 );
free( p_intf );
}
-/*****************************************************************************
- * 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_AssignKey( p_intf , 'd', INTF_KEY_DUMP_STREAM, 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 g_key )
-{
- int i_index;
- keyparm k_reply;
-
- k_reply = intf_GetKey( p_intf, g_key);
- switch( k_reply.key )
- {
- 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 + */
- vlc_mutex_lock( &p_aout_bank->lock );
- for( i_index = 0 ; i_index < p_aout_bank->i_count ; i_index++ )
- {
- if( p_aout_bank->pp_aout[i_index]->i_volume
- < VOLUME_MAX - VOLUME_STEP )
- {
- p_aout_bank->pp_aout[i_index]->i_volume += VOLUME_STEP;
- }
- else
- {
- p_aout_bank->pp_aout[i_index]->i_volume = VOLUME_MAX;
- }
- }
- vlc_mutex_unlock( &p_aout_bank->lock );
- break;
-
- case INTF_KEY_DEC_VOLUME: /* volume - */
- vlc_mutex_lock( &p_aout_bank->lock );
- for( i_index = 0 ; i_index < p_aout_bank->i_count ; i_index++ )
- {
- if( p_aout_bank->pp_aout[i_index]->i_volume > VOLUME_STEP )
- {
- p_aout_bank->pp_aout[i_index]->i_volume -= VOLUME_STEP;
- }
- else
- {
- p_aout_bank->pp_aout[i_index]->i_volume = 0;
- }
- }
- vlc_mutex_unlock( &p_aout_bank->lock );
- break;
-
- case INTF_KEY_TOGGLE_VOLUME: /* toggle mute */
- /* Start/stop feeding audio data. */
- if( p_intf->p_input != NULL )
- {
- input_ToggleMute( p_intf->p_input );
- }
-
- /* Start/stop playing sound. */
- vlc_mutex_lock( &p_aout_bank->lock );
- for( i_index = 0 ; i_index < p_aout_bank->i_count ; i_index++ )
- {
- if( p_aout_bank->pp_aout[i_index]->i_savedvolume )
- {
- p_aout_bank->pp_aout[i_index]->i_volume =
- p_aout_bank->pp_aout[i_index]->i_savedvolume;
- p_aout_bank->pp_aout[i_index]->i_savedvolume = 0;
- }
- else
- {
- p_aout_bank->pp_aout[i_index]->i_savedvolume =
- p_aout_bank->pp_aout[i_index]->i_volume;
- p_aout_bank->pp_aout[i_index]->i_volume = 0;
- }
- }
- vlc_mutex_unlock( &p_aout_bank->lock );
- break;
-
-/* XXX: fix this later */
-#if 0
- case INTF_KEY_DEC_GAMMA: /* gamma - */
- if( (p_main->p_vout != NULL) && (p_main->p_vout->f_gamma > -INTF_GAMMA_LIMIT) )
- {
- /* 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_INC_GAMMA: /* gamma + */
- if( (p_main->p_vout != NULL) && (p_main->p_vout->f_gamma < INTF_GAMMA_LIMIT) )
- {
- /* 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;
-#endif
-
- 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( 0 );
-}
-
projects / vlc / blobdiff