Skip to content

V
vlc
Commit 000cd66f authored by Vincent Seguin's avatar Vincent Seguin
Browse files
Options

Gras de parametres en ligne de commande ou en variables d'environnement, 

afin de ne pas avoir a recompiler le client en cas de loose.
parent 47caa07d
Show whitespace changes
Inline Side-by-side
Showing with 70 additions and 83 deletions
include/config.h
View file @ 000cd66f
...@@ -184,18 +184,13 @@ ...@@ -184,18 +184,13 @@
/* Maximum length of a hostname or source name */ /* Maximum length of a hostname or source name */
#define INPUT_MAX_SOURCE_LENGTH 100 #define INPUT_MAX_SOURCE_LENGTH 100
/* Default input method */
#define INPUT_DEFAULT_METHOD INPUT_METHOD_TS_UCAST
/* Default remote server */ /* Default remote server */
#define INPUT_DEFAULT_SERVER "138.195.143.220" #define INPUT_SERVER_VAR "vlc_server"
#define INPUT_SERVER_DEFAULT "138.195.143.220"
/* Default input port */ /* Default input port */
#define INPUT_DEFAULT_PORT 1234 #define INPUT_PORT_VAR "vlc_server_port"
#define INPUT_PORT_DEFAULT 1234
/* Default videolan VLAN */
#define VIDEOLAN_DEFAULT_VLAN 3
/* /*
* Vlan method * Vlan method
...@@ -240,7 +235,7 @@ ...@@ -240,7 +235,7 @@
*/ */
/* Environment variable used in place of DISPLAY if available */ /* Environment variable used in place of DISPLAY if available */
#define VOUT_DISPLAY_VAR "vlc_DISPLAY" #define VOUT_DISPLAY_VAR "vlc_display"
/* Default dimensions for display window - these dimensions are enough for the /* Default dimensions for display window - these dimensions are enough for the
* standard width and height broadcasted MPEG-2 streams */ * standard width and height broadcasted MPEG-2 streams */
...@@ -346,7 +341,7 @@ ...@@ -346,7 +341,7 @@
/* Define to enable messages queues - disabling messages queue can be usefull /* Define to enable messages queues - disabling messages queue can be usefull
* when debugging, since it allows messages which would not otherwise be printed, * when debugging, since it allows messages which would not otherwise be printed,
* due to a crash, to be printed anyway */ * due to a crash, to be printed anyway */
//#define INTF_MSG_QUEUE #define INTF_MSG_QUEUE
/* Format of the header for debug messages. The arguments following this header /* Format of the header for debug messages. The arguments following this header
* are the file (char *), the function (char *) and the line (int) in which the * are the file (char *), the function (char *) and the line (int) in which the
...@@ -365,18 +360,3 @@ ...@@ -365,18 +360,3 @@
/* Maximal number of commands which can be saved in history list */ /* Maximal number of commands which can be saved in history list */
#define INTF_CONSOLE_MAX_HISTORY 20 #define INTF_CONSOLE_MAX_HISTORY 20
/*******************************************************************************
* Network and VLAN management
*******************************************************************************/
/* Default network interface to use */
#define NET_DFLT_IF "eth0"
/* Default VLANserver address */
#define VLAN_DFLT_VLANSRV "vlanserver"
/* Default VLANserver port */
#define VLAN_DFLT_VLANPORT "6010"
/* Client identification */
#define VLAN_LOGIN "guest"
#define VLAN_PASSWD "none"
src/input/input_network.c
View file @ 000cd66f
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
#include "input_vlan.h" #include "input_vlan.h"
#include "intf_msg.h" #include "intf_msg.h"
#include "main.h"
/****************************************************************************** /******************************************************************************
* input_NetworkOpen: initialize a network stream * input_NetworkOpen: initialize a network stream
...@@ -97,7 +98,7 @@ int input_NetworkOpen( input_thread_t *p_input ) ...@@ -97,7 +98,7 @@ int input_NetworkOpen( input_thread_t *p_input )
/* Use default port if not specified */ /* Use default port if not specified */
if( p_input->i_port == 0 ) if( p_input->i_port == 0 )
{ {
p_input->i_port = INPUT_DEFAULT_PORT; p_input->i_port = main_GetIntVariable( INPUT_PORT_VAR, INPUT_PORT_DEFAULT );
} }
/* Find the address. */ /* Find the address. */
...@@ -165,7 +166,7 @@ int input_NetworkOpen( input_thread_t *p_input ) ...@@ -165,7 +166,7 @@ int input_NetworkOpen( input_thread_t *p_input )
/* Use default host if not specified */ /* Use default host if not specified */
if( p_input->psz_source == NULL ) if( p_input->psz_source == NULL )
{ {
p_input->psz_source = INPUT_DEFAULT_SERVER; p_input->psz_source = main_GetPszVariable( INPUT_SERVER_VAR, INPUT_SERVER_DEFAULT );
} }
if( BuildInetAddr( &sa_in, p_input->psz_source, htons(0) ) == (-1) ) if( BuildInetAddr( &sa_in, p_input->psz_source, htons(0) ) == (-1) )
......
src/interface/main.c
View file @ 000cd66f
...@@ -40,9 +40,14 @@ ...@@ -40,9 +40,14 @@
#define OPT_MONO 152 #define OPT_MONO 152
#define OPT_NOVIDEO 160 #define OPT_NOVIDEO 160
#define OPT_COLOR 161 #define OPT_DISPLAY 161
#define OPT_WIDTH 162
#define OPT_HEIGHT 163
#define OPT_COLOR 164
#define OPT_NOVLANS 170 #define OPT_NOVLANS 170
#define OPT_SERVER 171
#define OPT_PORT 172
/* Long options */ /* Long options */
static const struct option longopts[] = static const struct option longopts[] =
...@@ -59,11 +64,16 @@ static const struct option longopts[] = ...@@ -59,11 +64,16 @@ static const struct option longopts[] =
/* Video options */ /* Video options */
{ "novideo", 0, 0, OPT_NOVIDEO }, { "novideo", 0, 0, OPT_NOVIDEO },
{ "display", 1, 0, OPT_DISPLAY },
{ "width", 1, 0, OPT_WIDTH },
{ "height", 1, 0, OPT_HEIGHT },
{ "grayscale", 0, 0, 'g' }, { "grayscale", 0, 0, 'g' },
{ "color", 0, 0, OPT_COLOR }, { "color", 0, 0, OPT_COLOR },
/* VLAN management options */ /* Input options */
{ "novlans", 0, 0, OPT_NOVLANS }, { "novlans", 0, 0, OPT_NOVLANS },
{ "server", 1, 0, OPT_SERVER },
{ "port", 1, 0, OPT_PORT },
{ 0, 0, 0, 0 } { 0, 0, 0, 0 }
}; };
...@@ -276,26 +286,6 @@ static void SetDefaultConfiguration( void ) ...@@ -276,26 +286,6 @@ static void SetDefaultConfiguration( void )
p_main->b_audio = 1; p_main->b_audio = 1;
p_main->b_video = 1; p_main->b_video = 1;
p_main->b_vlans = 1; p_main->b_vlans = 1;
/*
* Audio output thread configuration
*/
// ?? initialization using structures is no more available, use putenv/getenv
// instead.
/*
* Video output thread configuration
*/
// p_data->vout_cfg.i_properties = 0;
/* VLAN management */
/*??? p_data->cfg.b_vlans = 0;
p_data->cfg.psz_input_vlan_server = VLAN_DEFAULT_SERVER;
p_data->cfg.i_input_vlan_server_port = VLAN_DEFAULT_SERVER_PORT;
*/
} }
/******************************************************************************* /*******************************************************************************
...@@ -344,6 +334,16 @@ static int GetConfiguration( int i_argc, char *ppsz_argv[], char *ppsz_env[] ) ...@@ -344,6 +334,16 @@ static int GetConfiguration( int i_argc, char *ppsz_argv[], char *ppsz_env[] )
case OPT_NOVIDEO: /* --novideo */ case OPT_NOVIDEO: /* --novideo */
p_main->b_video = 0; p_main->b_video = 0;
break; break;
case OPT_DISPLAY: /* --display */
main_PutPszVariable( VOUT_DISPLAY_VAR, optarg );
break;
case OPT_WIDTH: /* --width */
main_PutPszVariable( VOUT_WIDTH_VAR, optarg );
break;
case OPT_HEIGHT: /* --height */
main_PutPszVariable( VOUT_HEIGHT_VAR, optarg );
break;
case 'g': /* -g, --grayscale */ case 'g': /* -g, --grayscale */
main_PutIntVariable( VOUT_GRAYSCALE_VAR, 1 ); main_PutIntVariable( VOUT_GRAYSCALE_VAR, 1 );
break; break;
...@@ -351,10 +351,16 @@ static int GetConfiguration( int i_argc, char *ppsz_argv[], char *ppsz_env[] ) ...@@ -351,10 +351,16 @@ static int GetConfiguration( int i_argc, char *ppsz_argv[], char *ppsz_env[] )
main_PutIntVariable( VOUT_GRAYSCALE_VAR, 0 ); main_PutIntVariable( VOUT_GRAYSCALE_VAR, 0 );
break; break;
/* VLAN management options */ /* Input options */
case OPT_NOVLANS: /* --novlans */ case OPT_NOVLANS: /* --novlans */
p_main->b_vlans = 0; p_main->b_vlans = 0;
break; break;
case OPT_SERVER: /* --server */
main_PutPszVariable( INPUT_SERVER_VAR, optarg );
break;
case OPT_PORT: /* --port */
main_PutPszVariable( INPUT_PORT_VAR, optarg );
break;
/* Internal error: unknown option */ /* Internal error: unknown option */
case '?': case '?':
...@@ -383,58 +389,58 @@ static void Usage( void ) ...@@ -383,58 +389,58 @@ static void Usage( void )
intf_Msg(COPYRIGHT_MESSAGE "\n"); intf_Msg(COPYRIGHT_MESSAGE "\n");
/* Usage */ /* Usage */
intf_Msg("usage: vlc [options...] [parameters]\n" \ intf_Msg("usage: vlc [options...] [parameters]\n" );
" parameters can be passed using environment variables\n" \
" example: vlan_server=vlan-server.via.ecp.fr:1234\n" \
);
/* Options */ /* Options */
intf_Msg("Options:\n" \ intf_Msg("Options:\n" \
" -h, --help print usage\n" \ " -h, --help \tprint usage\n" \
" -g, --grayscale grayscale video\n" \ " --noaudio \tdisable audio\n" \
" --noaudio disable audio\n" \ " --stereo, --mono \tstereo/mono audio\n" \
" --stereo enable stereo\n" \ " --novideo \tdisable video\n" \
" --mono disable stereo\n" " --display <display> \tdisplay string\n" \
" --novideo disable video\n" \ " --width <w>, --height <h> \tdisplay dimensions\n" \
" --color color video\n" \ " -g, --grayscale, --color \tgrayscale/color video\n" \
" --novlans disable vlans\n" \ " --novlans \tdisable vlans\n" \
" --server <host>, --port <port> \tvideo server adress\n" \
); );
/* Interface parameters */ /* Interface parameters */
intf_Msg("Interface parameters:\n" \ intf_Msg("Interface parameters:\n" \
" " INTF_INIT_SCRIPT_VAR "=<filename> initialization script\n" \ " " INTF_INIT_SCRIPT_VAR "=<filename> \tinitialization script\n" \
); );
/* Audio parameters */ /* Audio parameters */
intf_Msg("Audio parameters:\n" \ intf_Msg("Audio parameters:\n" \
" " AOUT_DSP_VAR "=<filename> dsp device path\n" \ " " AOUT_DSP_VAR "=<filename> \tdsp device path\n" \
" " AOUT_STEREO_VAR "={1|0} stereo or mono output\n" \ " " AOUT_STEREO_VAR "={1|0} \tstereo or mono output\n" \
" " AOUT_RATE_VAR "=<rate> output rate\n" \ " " AOUT_RATE_VAR "=<rate> \toutput rate\n" \
); );
/* Video parameters */ /* Video parameters */
intf_Msg("Video parameters:\n" \ intf_Msg("Video parameters:\n" \
" " VOUT_DISPLAY_VAR "=<display name> display used\n" " " VOUT_DISPLAY_VAR "=<display name> \tdisplay used\n" \
" " VOUT_WIDTH_VAR "=<width> display width\n" " " VOUT_WIDTH_VAR "=<width> \tdisplay width\n" \
" " VOUT_HEIGHT_VAR "=<height> dislay height\n" " " VOUT_HEIGHT_VAR "=<height> \tdislay height\n" \
" " VOUT_FB_DEV_VAR "=<filename> framebuffer device path\n" \ " " VOUT_FB_DEV_VAR "=<filename> \tframebuffer device path\n" \
" " VOUT_GRAYSCALE_VAR "={1|0} grayscale or color output\n" \ " " VOUT_GRAYSCALE_VAR "={1|0} \tgrayscale or color output\n" \
); );
/* Vlan parameters */ /* Input parameters */
intf_Msg("VLANs (Virtual Local Aera Networks) parameters:\n" \ intf_Msg("Input parameters:\n" \
" " INPUT_IFACE_VAR "=<interface> network interface\n" \ " " INPUT_SERVER_VAR "=<hostname> \tvideo server\n" \
" " INPUT_VLAN_SERVER_VAR "=<hostname> vlan server\n" \ " " INPUT_PORT_VAR "=<port> \tvideo server port\n" \
" " INPUT_VLAN_PORT_VAR "=<port> vlan server port\n" \ " " INPUT_IFACE_VAR "=<interface> \tnetwork interface\n" \
" " INPUT_VLAN_SERVER_VAR "=<hostname> \tvlan server\n" \
" " INPUT_VLAN_PORT_VAR "=<port> \tvlan server port\n" \
); );
/* Interfaces keys */ /* Interfaces keys */
intf_Msg("Interface keys: most interfaces accept the following commands:\n" \ intf_Msg("Interface keys: most interfaces accept the following commands:\n" \
" [esc], q quit\n" \ " [esc], q \tquit\n" \
" +, -, m change volume, mute\n" \ " +, -, m \tchange volume, mute\n" \
" g, G, c change gamma, toggle grayscale\n" \ " g, G, c \tchange gamma, toggle grayscale\n" \
" 0 - 9 select channel\n" \ " 0 - 9 \tselect channel\n" \
" [space] toggle info printing\n" \ " [space] \ttoggle info printing\n" \
); );
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment