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.

diff --git a/include/config.h b/include/config.h
index d70c1f6eccde8cb0f9261ea0a2f99c3c176a4afb..9b917b4c0b494f90886189f44738c4f4bcf8e8c8 100644 (file)
--- a/include/config.h
+++ b/include/config.h
@@ -182,20 +182,15 @@
 #undef INPUT_LIFO_PES_NETLIST
 
 /* Maximum length of a hostname or source name */
-#define INPUT_MAX_SOURCE_LENGTH       100
-
-
-/* Default input method */
-#define INPUT_DEFAULT_METHOD            INPUT_METHOD_TS_UCAST
+#define INPUT_MAX_SOURCE_LENGTH         100
 
 /* 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 */
-#define INPUT_DEFAULT_PORT           1234
-
-/* Default videolan VLAN */
-#define VIDEOLAN_DEFAULT_VLAN           3
+#define INPUT_PORT_VAR                  "vlc_server_port"
+#define INPUT_PORT_DEFAULT              1234
 
 /*
  * Vlan method 
@@ -240,7 +235,7 @@
  */
 
 /* 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 
  * standard width and height broadcasted MPEG-2 streams */
@@ -346,7 +341,7 @@
 /* Define to enable messages queues - disabling messages queue can be usefull
  * when debugging, since it allows messages which would not otherwise be printed,
  * 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
  * are the file (char *), the function (char *) and the line (int) in which the
@@ -365,18 +360,3 @@
 /* Maximal number of commands which can be saved in history list */
 #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"

diff --git a/src/input/input_network.c b/src/input/input_network.c
index 306d7becc74a7d78a56b5dba98968a5951d4d11a..598cf2a8437eaa027939a3156a4b7f344dce54e6 100644 (file)
--- a/src/input/input_network.c
+++ b/src/input/input_network.c
@@ -31,6 +31,7 @@
 #include "input_vlan.h"
 
 #include "intf_msg.h"
+#include "main.h"
 
 /******************************************************************************
  * input_NetworkOpen: initialize a network stream
@@ -97,7 +98,7 @@ int input_NetworkOpen( input_thread_t *p_input )
     /* Use default port if not specified */
     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. */
@@ -165,7 +166,7 @@ int input_NetworkOpen( input_thread_t *p_input )
     /* Use default host if not specified */
     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) )

diff --git a/src/interface/main.c b/src/interface/main.c
index c170b706827e632824698611229f32af6733a1b5..f4f59f4fa2909d3b261bedc07566ed394d9ae07c 100644 (file)
--- a/src/interface/main.c
+++ b/src/interface/main.c
@@ -40,9 +40,14 @@
 #define OPT_MONO                152
 
 #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_SERVER              171
+#define OPT_PORT                172
  
 /* Long options */
 static const struct option longopts[] =
@@ -59,11 +64,16 @@ static const struct option longopts[] =
 
     /* Video options */
     {   "novideo",          0,          0,      OPT_NOVIDEO },           
+    {   "display",          1,          0,      OPT_DISPLAY },  
+    {   "width",            1,          0,      OPT_WIDTH },
+    {   "height",           1,          0,      OPT_HEIGHT },                
     {   "grayscale",        0,          0,      'g' },    
     {   "color",            0,          0,      OPT_COLOR },                
 
-    /* VLAN management options */
+    /* Input options */
     {   "novlans",          0,          0,      OPT_NOVLANS },
+    {   "server",           1,          0,      OPT_SERVER },
+    {   "port",             1,          0,      OPT_PORT },
 
     {   0,                  0,          0,      0 }
 };
@@ -276,26 +286,6 @@ static void SetDefaultConfiguration( void )
     p_main->b_audio  = 1;
     p_main->b_video  = 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[] )
         case OPT_NOVIDEO:                                         /* --novideo */
             p_main->b_video = 0;
             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 */
             main_PutIntVariable( VOUT_GRAYSCALE_VAR, 1 );
             break;            
@@ -351,10 +351,16 @@ static int GetConfiguration( int i_argc, char *ppsz_argv[], char *ppsz_env[] )
             main_PutIntVariable( VOUT_GRAYSCALE_VAR, 0 );
             break;            
 
-        /* VLAN management options */
+        /* Input options */
         case OPT_NOVLANS:                                         /* --novlans */
             p_main->b_vlans = 0;
             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 */
         case '?':                          
@@ -383,58 +389,58 @@ static void Usage( void )
     intf_Msg(COPYRIGHT_MESSAGE "\n");
 
     /* Usage */
-    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" \
-            );
+    intf_Msg("usage: vlc [options...] [parameters]\n" );
 
     /* Options */
     intf_Msg("Options:\n" \
-             "  -h, --help                      print usage\n" \
-             "  -g, --grayscale                 grayscale video\n" \
-             "  --noaudio                       disable audio\n" \
-             "  --stereo                        enable stereo\n" \
-             "  --mono                          disable stereo\n"
-             "  --novideo                       disable video\n" \
-             "  --color                         color video\n" \
-             "  --novlans                       disable vlans\n" \
+             "  -h, --help                        \tprint usage\n" \
+             "  --noaudio                         \tdisable audio\n" \
+             "  --stereo, --mono                  \tstereo/mono audio\n" \
+             "  --novideo                         \tdisable video\n" \
+             "  --display <display>               \tdisplay string\n" \
+             "  --width <w>, --height <h>         \tdisplay dimensions\n" \
+             "  -g, --grayscale, --color          \tgrayscale/color video\n" \
+             "  --novlans                         \tdisable vlans\n" \
+             "  --server <host>, --port <port>    \tvideo server adress\n" \
              );
 
     /* Interface parameters */
     intf_Msg("Interface parameters:\n" \
-            "  " INTF_INIT_SCRIPT_VAR "=<filename>             initialization script\n" \
+            "  " INTF_INIT_SCRIPT_VAR "=<filename>             \tinitialization script\n" \
             );
 
     /* Audio parameters */
     intf_Msg("Audio parameters:\n" \
-             "  " AOUT_DSP_VAR "=<filename>              dsp device path\n" \
-             "  " AOUT_STEREO_VAR "={1|0}                stereo or mono output\n" \
-             "  " AOUT_RATE_VAR "=<rate>           output rate\n" \
+             "  " AOUT_DSP_VAR "=<filename>              \tdsp device path\n" \
+             "  " AOUT_STEREO_VAR "={1|0}                \tstereo or mono output\n" \
+             "  " AOUT_RATE_VAR "=<rate>             \toutput rate\n" \
             );
 
     /* Video parameters */
     intf_Msg("Video parameters:\n" \
-             "  " VOUT_DISPLAY_VAR "=<display name>      display used\n"
-             "  " VOUT_WIDTH_VAR "=<width>               display width\n"
-             "  " VOUT_HEIGHT_VAR "=<height>             dislay height\n"
-             "  " VOUT_FB_DEV_VAR "=<filename>           framebuffer device path\n" \
-             "  " VOUT_GRAYSCALE_VAR "={1|0}             grayscale or color output\n" \
+             "  " VOUT_DISPLAY_VAR "=<display name>      \tdisplay used\n" \
+             "  " VOUT_WIDTH_VAR "=<width>               \tdisplay width\n" \
+             "  " VOUT_HEIGHT_VAR "=<height>             \tdislay height\n" \
+             "  " VOUT_FB_DEV_VAR "=<filename>           \tframebuffer device path\n" \
+             "  " VOUT_GRAYSCALE_VAR "={1|0}             \tgrayscale or color output\n" \
             ); 
 
-    /* Vlan parameters */
-    intf_Msg("VLANs (Virtual Local Aera Networks) parameters:\n" \
-            "  " INPUT_IFACE_VAR "=<interface>          network interface\n" \
-             "  " INPUT_VLAN_SERVER_VAR "=<hostname>     vlan server\n" \
-             "  " INPUT_VLAN_PORT_VAR "=<port>           vlan server port\n" \
+    /* Input parameters */
+    intf_Msg("Input parameters:\n" \
+             "  " INPUT_SERVER_VAR "=<hostname>          \tvideo server\n" \
+             "  " INPUT_PORT_VAR "=<port>            \tvideo 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 */
     intf_Msg("Interface keys: most interfaces accept the following commands:\n" \
-             "  [esc], q                        quit\n" \
-             "  +, -, m                         change volume, mute\n" \
-             "  g, G, c                         change gamma, toggle grayscale\n" \
-             "  0 - 9                           select channel\n" \
-             "  [space]                         toggle info printing\n" \
+             "  [esc], q                          \tquit\n" \
+             "  +, -, m                           \tchange volume, mute\n" \
+             "  g, G, c                           \tchange gamma, toggle grayscale\n" \
+             "  0 - 9                             \tselect channel\n" \
+             "  [space]                           \ttoggle info printing\n" \
              );    
 }