]> git.sesse.net Git - vlc/blobdiff - src/interface/main.c
Bon, puisque �a semble commiter sous BeOS, je commite.
[vlc] / src / interface / main.c
index dd914573f3da1b825a603109530710c9ac44f647..b991a4e896ddd24c9ebf03de0aee48270dbfdeae 100644 (file)
-/*******************************************************************************
+/*****************************************************************************
  * main.c: main vlc source
- * (c)1998 VideoLAN
- *******************************************************************************
  * Includes the main() function for vlc. Parses command line, start interface
  * and spawn threads.
- *******************************************************************************/
-
-/*******************************************************************************
+ *****************************************************************************
+ * Copyright (C) 1998, 1999, 2000 VideoLAN
+ *
+ * Authors:
+ *
+ * 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
+ * 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.
+ *
+ * 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 <errno.h>
-#include <getopt.h>
-#include <pthread.h>
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <netinet/in.h>
-#include <sys/soundcard.h>
-#include <sys/uio.h>
-#include <X11/Xlib.h>
-#include <X11/extensions/XShm.h>
+ *****************************************************************************/
+#include "defs.h"
+
+#include <signal.h>                               /* SIGHUP, SIGINT, SIGKILL */
+#include <getopt.h>                                              /* getopt() */
+#include <stdio.h>                                              /* sprintf() */
+
+#include <errno.h>                                                 /* ENOMEM */
+#include <stdlib.h>                                  /* getenv(), strtol(),  */
+#include <string.h>                                            /* strerror() */
 
 #include "config.h"
 #include "common.h"
+#include "threads.h"
 #include "mtime.h"
-#include "netutils.h"
-#include "debug.h"
-
-#include "intf_msg.h"
-
-#include "input.h"
+#include "plugins.h"
+#include "playlist.h"
 #include "input_vlan.h"
-#include "input_netlist.h"
-#include "decoder_fifo.h"
-
-#include "audio_output.h"
-#include "audio_decoder.h"
+#include "input_ps.h"
 
-#include "video.h"
-#include "video_output.h"
-#include "video_decoder.h"
-
-#include "xconsole.h"
+#include "intf_msg.h"
 #include "interface.h"
 
-#include "pgm_data.h"
+#include "audio_output.h"
 
+#ifdef SYS_BEOS
+#include "beos_specific.h"
+#endif
 
+#include "main.h"
 
-/*
+/*****************************************************************************
  * Command line options constants. If something is changed here, be sure that
  * GetConfiguration and Usage are also changed.
- */
+ *****************************************************************************/
 
 /* Long options return values - note that values corresponding to short options
  * chars, and in general any regular char, should be avoided */
-#define OPT_DISPLAY             130
-
-#define OPT_CONSOLE_DISPLAY     140
-#define OPT_CONSOLE_GEOMETRY    141
-
 #define OPT_NOAUDIO             150
-#define OPT_STEREO              151
-#define OPT_MONO                152
-#define OPT_RATE                153
+#define OPT_AOUT                151
+#define OPT_STEREO              152
+#define OPT_MONO                153
 
 #define OPT_NOVIDEO             160
-#define OPT_XSHM                161
-#define OPT_NOXSHM              162
+#define OPT_VOUT                161
+#define OPT_DISPLAY             162
+#define OPT_WIDTH               163
+#define OPT_HEIGHT              164
+#define OPT_COLOR               165
 
 #define OPT_NOVLANS             170
-#define OPT_VLAN_SERVER         171
+#define OPT_SERVER              171
+#define OPT_PORT                172
+
+/* Usage fashion */
+#define USAGE                     0
+#define SHORT_HELP                1
+#define LONG_HELP                 2
+
 /* Long options */
 static const struct option longopts[] =
-{   
-    /*  name,               has_arg,    flag,   val */     
+{
+    /*  name,               has_arg,    flag,   val */
 
     /* General/common options */
-    {   "help",             0,          0,      'h' },          
-    {   "display",          1,          0,      OPT_DISPLAY },
-
-    /* Interface options */
-    {   "console-display",  1,          0,      OPT_CONSOLE_DISPLAY }, 
-    {   "console-geometry", 1,          0,      OPT_CONSOLE_GEOMETRY },
+    {   "help",             0,          0,      'h' },
+    {   "longhelp",         0,          0,      'H' },
+    {   "version",          0,          0,      'v' },
 
     /* Audio options */
-    {   "noaudio",          0,          0,      OPT_NOAUDIO },       
+    {   "noaudio",          0,          0,      OPT_NOAUDIO },
+    {   "aout",             1,          0,      OPT_AOUT },
     {   "stereo",           0,          0,      OPT_STEREO },
-    {   "mono",             0,          0,      OPT_MONO },      
-    {   "rate",             0,          0,      OPT_RATE },
+    {   "mono",             0,          0,      OPT_MONO },
 
     /* Video options */
-    {   "novideo",          0,          0,      OPT_NOVIDEO },           
-    {   "xshm",             0,          0,      OPT_XSHM },
-    {   "noxshm",           0,          0,      OPT_NOXSHM },    
-
-    /* VLAN management options */
+    {   "novideo",          0,          0,      OPT_NOVIDEO },
+    {   "vout",             1,          0,      OPT_VOUT },
+    {   "display",          1,          0,      OPT_DISPLAY },
+    {   "width",            1,          0,      OPT_WIDTH },
+    {   "height",           1,          0,      OPT_HEIGHT },
+    {   "grayscale",        0,          0,      'g' },
+    {   "color",            0,          0,      OPT_COLOR },
+
+    /* DVD options */
+    {   "dvdaudio",         1,          0,      'a' },
+    {   "dvdchannel",       1,          0,      'c' },
+    {   "dvdsubtitle",      1,          0,      's' },
+    
+    /* Input options */
     {   "novlans",          0,          0,      OPT_NOVLANS },
-    {   "vlanserver",       1,          0,      OPT_VLAN_SERVER },                    
+    {   "server",           1,          0,      OPT_SERVER },
+    {   "port",             1,          0,      OPT_PORT },
 
     {   0,                  0,          0,      0 }
 };
 
 /* Short options */
-static const char *psz_shortopts = "h";
+static const char *psz_shortopts = "hHvga:s:c:";
 
-/*
- * Global variable program_data
- */
-program_data_t *p_program_data;                              /* see pgm_data.h */
+/*****************************************************************************
+ * Global variable program_data - this is the one and only, see main.h
+ *****************************************************************************/
+main_t *p_main;
 
-/*
+/*****************************************************************************
  * Local prototypes
- */
-static void SetDefaultConfiguration ( program_data_t *p_data );
-static int  GetConfiguration        ( program_data_t *p_config, int i_argc, char *ppsz_argv[],
+ *****************************************************************************/
+static void SetDefaultConfiguration ( void );
+static int  GetConfiguration        ( int i_argc, char *ppsz_argv[],
                                       char *ppsz_env[] );
-static void Usage                   ( void );
-static long GetIntParam             ( const char *psz_param, long i_min, long i_max, int *pi_err );
+static void Usage                   ( int i_fashion );
+static void Version                 ( void );
+
 static void InitSignalHandler       ( void );
 static void SignalHandler           ( int i_signal );
+#ifdef HAVE_MMX
+static int  TestMMX                 ( void );
+#endif
 
-/*******************************************************************************
+/*****************************************************************************
  * main: parse command line, start interface and spawn threads
- *******************************************************************************
+ *****************************************************************************
  * Steps during program execution are:
  *      -configuration parsing and messages interface initialization
- *      -openning of audio output device
+ *      -opening of audio output device and some global modules
  *      -execution of interface, which exit on error or on user request
- *      -closing of audio output device
- * On error, the spawned threads are cancelled, and the openned devices closed.
- *******************************************************************************
- * ?? Signal handlers should be restored to default once the interface has
- * been closed, since they will cause a crash if the message interface is no
- * more active.
- *******************************************************************************/
+ *      -closing of audio output device and some global modules
+ * On error, the spawned threads are canceled, and the open devices closed.
+ *****************************************************************************/
 int main( int i_argc, char *ppsz_argv[], char *ppsz_env[] )
 {
-    program_data_t  program_data;         /* root of all data - see pgm_data.h */
-    
+    main_t  main_data;                      /* root of all data - see main.h */
+
+    p_main = &main_data;                       /* set up the global variable */
+
+#ifdef SYS_BEOS
     /*
-     * Read configuration, initialize messages interface and set up program
+     * System specific initialization code
      */
-    p_program_data = &program_data;              /* set up the global variable */
-    if( intf_InitMsg( &program_data.intf_msg ) )   /* start messages interface */
+    beos_Create();
+#endif
+
+#ifdef HAVE_MMX
+    /*
+     * Test if our code is likely to run on this CPU 
+     */
+    if( !TestMMX() )
     {
-        fprintf(stderr, "intf critical: can't initialize messages interface (%s)\n",
-                strerror(errno));
-        return(errno);
+        fprintf( stderr, "Sorry, this program needs an MMX processor. "
+                         "Please run the non-MMX version.\n" );
+        return( 1 );
     }
-    if( GetConfiguration( &program_data,                 /* parse command line */
-                          i_argc, ppsz_argv, ppsz_env ) )
+#endif
+
+    /*
+     * Initialize messages interface
+     */
+    p_main->p_msg = intf_MsgCreate();
+    if( !p_main->p_msg )                         /* start messages interface */
     {
-        intf_TerminateMsg( &program_data.intf_msg );
-        return(errno);
+        fprintf( stderr, "error: can't initialize messages interface (%s)\n",
+                strerror(errno) );
+        return( errno );
     }
-    intf_MsgImm( COPYRIGHT_MESSAGE );                 /* print welcome message */
-    InitSignalHandler();                   /* prepare signals for interception */    
+
+    /*
+     * Read configuration
+     */
+    if( GetConfiguration( i_argc, ppsz_argv, ppsz_env ) )  /* parse cmd line */
+    {
+        intf_MsgDestroy();
+        fprintf( stderr, "error: can't read configuration (%s)\n",
+                strerror(errno) );
+        return( errno );
+    }
+
+    /*
+     * Initialize playlist and get commandline files
+     */
+    p_main->p_playlist = playlist_Create( );
+    if( !p_main->p_playlist )
+    {
+        intf_Msg( "Playlist initialization failed\n" );
+        intf_MsgDestroy();
+        return( errno );
+    }
+    playlist_Init( p_main->p_playlist, optind );
+
+    /*
+     * Initialize plugin bank
+     */
+    p_main->p_bank = bank_Create( );
+    if( !p_main->p_bank )
+    {
+        intf_Msg( "Plugin bank initialization failed\n" );
+        playlist_Destroy( p_main->p_playlist );
+        intf_MsgDestroy();
+        return( errno );
+    }
+    bank_Init( p_main->p_bank );
 
     /*
      * Initialize shared resources and libraries
      */
-    if( program_data.cfg.b_vlans 
-         && input_VlanMethodInit( &program_data.input_vlan_method, 
-                                  program_data.cfg.psz_input_vlan_server,
-                                  program_data.cfg.i_input_vlan_server_port) )
+    if( p_main->b_vlans && input_VlanCreate() )
     {
-        /* On error during vlans initialization, switch of vlans */
-        intf_Msg("intf: switching off vlans\n");
-        program_data.cfg.b_vlans = 0;
+        /* On error during vlans initialization, switch off vlans */
+        intf_Msg( "Virtual LANs initialization failed : "
+                  "vlans management is deactivated\n" );
+        p_main->b_vlans = 0;
     }
-    
+
     /*
-     * Open audio device
+     * Open audio device and start aout thread
      */
-    if( program_data.cfg.b_audio )
-    {                                                
-        if( aout_Open( &program_data.aout_thread ) )
+    if( p_main->b_audio )
+    {
+        p_main->p_aout = aout_CreateThread( NULL );
+        if( p_main->p_aout == NULL )
         {
-            /* On error during audio initialization, switch of audio */
-            intf_Msg("intf: switching off audio\n");
-            program_data.cfg.b_audio = 0;
+            /* On error during audio initialization, switch off audio */
+            intf_Msg( "Audio initialization failed : audio is deactivated\n" );
+            p_main->b_audio = 0;
         }
-        else if( aout_SpawnThread( &program_data.aout_thread ) )
-        {
-            aout_Close( &program_data.aout_thread );
-            input_VlanMethodFree( &program_data.input_vlan_method );            
-            intf_TerminateMsg( &program_data.intf_msg );
-            return( -1 );
-        }
-        program_data.intf_thread.p_aout = &program_data.aout_thread;
     }
-    
+
     /*
      * Run interface
      */
-    intf_DbgMsg("intf debug: starting interface\n");
-    intf_Run( &program_data.intf_thread );
-    intf_DbgMsg("intf debug: interface terminated\n");
+    p_main->p_intf = intf_Create();
+    if( p_main->p_intf != NULL )
+    {
+        InitSignalHandler();             /* prepare signals for interception */
 
-    /* 
+        intf_Run( p_main->p_intf );
+
+        intf_Destroy( p_main->p_intf );
+    }
+
+    /*
      * Close audio device
      */
-    if( program_data.cfg.b_audio )                 
+    if( p_main->b_audio )
     {
-        aout_CancelThread( &program_data.aout_thread );
-        aout_Close( &program_data.aout_thread );
-    }    
+        aout_DestroyThread( p_main->p_aout, NULL );
+    }
 
     /*
      * Free shared resources and libraries
      */
-    if( program_data.cfg.b_vlans )
-    {        
-        input_VlanMethodFree( &program_data.input_vlan_method );    
-    }    
+    if( p_main->b_vlans )
+    {
+        input_VlanDestroy();
+    }
 
     /*
-     * Terminate messages interface and program
+     * Free plugin bank
      */
-    intf_Msg( "program terminated.\n" );
-    intf_TerminateMsg( &program_data.intf_msg );
-    return( 0 );
-}
+    bank_Destroy( p_main->p_bank );
 
-/* following functions are local */
+    /*
+     * Free playlist
+     */
+    playlist_Destroy( p_main->p_playlist );
 
-/*******************************************************************************
- * SetDefaultConfiguration: set default options
- *******************************************************************************
- * This function is called by GetConfiguration before command line is parsed.
- * It sets all the default values required later by the program. Note that
- * all properties must be initialized, wether they are command-line dependant
- * or not.
- *******************************************************************************/
-static void SetDefaultConfiguration( program_data_t *p_data )
-{
+#ifdef SYS_BEOS
     /*
-     * Audio output thread configuration 
+     * System specific cleaning code
      */
-    p_data->cfg.b_audio = 1;                 /* audio is activated by default */
-    p_data->aout_thread.dsp.psz_device = AOUT_DEFAULT_DEVICE;
-    /* je rajouterai la détection des formats supportés quand le reste
-     * marchera */
-    p_data->aout_thread.dsp.i_format = AOUT_DEFAULT_FORMAT;
-    p_data->aout_thread.dsp.b_stereo = AOUT_DEFAULT_STEREO;
-    p_data->aout_thread.dsp.l_rate = AOUT_DEFAULT_RATE;
+    beos_Destroy();
+#endif
 
     /*
-     * Interface thread configuration
+     * Terminate messages interface and program
      */
-    /* X11 console */
-    p_data->intf_thread.xconsole.psz_display = NULL;
-    p_data->intf_thread.xconsole.psz_geometry =        INTF_XCONSOLE_GEOMETRY;
+    intf_Msg( "Program terminated.\n" );
+    intf_MsgDestroy();
 
-    /* --- ?? following are ok */
+    return( 0 );
+}
 
+/*****************************************************************************
+ * main_GetIntVariable: get the int value of an environment variable
+ *****************************************************************************
+ * This function is used to read some default parameters in modules.
+ *****************************************************************************/
+int main_GetIntVariable( char *psz_name, int i_default )
+{
+    char *      psz_env;                                /* environment value */
+    char *      psz_end;                             /* end of parsing index */
+    long int    i_value;                                            /* value */
+
+    psz_env = getenv( psz_name );
+    if( psz_env )
+    {
+        i_value = strtol( psz_env, &psz_end, 0 );
+        if( (*psz_env != '\0') && (*psz_end == '\0') )
+        {
+            return( i_value );
+        }
+    }
+    return( i_default );
+}
+
+/*****************************************************************************
+ * main_GetPszVariable: get the string value of an environment variable
+ *****************************************************************************
+ * This function is used to read some default parameters in modules.
+ *****************************************************************************/
+char * main_GetPszVariable( char *psz_name, char *psz_default )
+{
+    char *psz_env;
+
+    psz_env = getenv( psz_name );
+    if( psz_env )
+    {
+        return( psz_env );
+    }
+    return( psz_default );
+}
+
+/*****************************************************************************
+ * main_PutPszVariable: set the string value of an environment variable
+ *****************************************************************************
+ * This function is used to set some default parameters in modules. The use of
+ * this function will cause some memory leak: since some systems use the pointer
+ * passed to putenv to store the environment string, it can't be freed.
+ *****************************************************************************/
+void main_PutPszVariable( char *psz_name, char *psz_value )
+{
+    char *psz_env;
+
+    psz_env = malloc( strlen(psz_name) + strlen(psz_value) + 2 );
+    if( psz_env == NULL )
+    {
+        intf_ErrMsg( "error: %s\n", strerror(ENOMEM) );
+    }
+    else
+    {
+        sprintf( psz_env, "%s=%s", psz_name, psz_value );
+        if( putenv( psz_env ) )
+        {
+            intf_ErrMsg( "error: %s\n", strerror(errno) );
+        }
+    }
+}
+
+/*****************************************************************************
+ * main_PutIntVariable: set the integer value of an environment variable
+ *****************************************************************************
+ * This function is used to set some default parameters in modules. The use of
+ * this function will cause some memory leak: since some systems use the pointer
+ * passed to putenv to store the environment string, it can't be freed.
+ *****************************************************************************/
+void main_PutIntVariable( char *psz_name, int i_value )
+{
+    char psz_value[ 256 ];                               /* buffer for value */
+
+    sprintf( psz_value, "%d", i_value );
+    main_PutPszVariable( psz_name, psz_value );
+}
+
+/* following functions are local */
+
+/*****************************************************************************
+ * SetDefaultConfiguration: set default options
+ *****************************************************************************
+ * This function is called by GetConfiguration before command line is parsed.
+ * It sets all the default values required later by the program. At this stage,
+ * most structure are not yet allocated, so initialization must be done using
+ * environment.
+ *****************************************************************************/
+static void SetDefaultConfiguration( void )
+{
     /*
-     * Video output thread configuration
+     * All features are activated by default
      */
-    p_data->cfg.b_video =                   1;    
-    p_data->vout_cfg.i_properties =         0;
-
-    /* VLAN management */
-    p_data->cfg.b_vlans =                   1;    
-    p_data->cfg.psz_input_vlan_server =     VLAN_DEFAULT_SERVER;
-    p_data->cfg.i_input_vlan_server_port =  VLAN_DEFAULT_SERVER_PORT;    
+    p_main->b_audio  = 1;
+    p_main->b_video  = 1;
+    p_main->b_vlans  = 1;
 }
 
-/*******************************************************************************
+/*****************************************************************************
  * GetConfiguration: parse command line
- *******************************************************************************
+ *****************************************************************************
  * Parse command line and configuration file for configuration. If the inline
  * help is requested, the function Usage() is called and the function returns
- * -1 (causing main() to exit). Note than messages interface is initialized at
- * this stage.
- *******************************************************************************/
-static int GetConfiguration( program_data_t *p_data, int i_argc, 
-                             char *ppsz_argv[], char *ppsz_env[] )
+ * -1 (causing main() to exit). The messages interface is initialized at this
+ * stage, but most structures are not allocated, so only environment should
+ * be used.
+ *****************************************************************************/
+static int GetConfiguration( int i_argc, char *ppsz_argv[], char *ppsz_env[] )
 {
-    int c, i_err;
+    int c, i_opt;
 
     /* Set default configuration and copy arguments */
-    p_data->i_argc = i_argc;
-    p_data->ppsz_argv = ppsz_argv;
-    p_data->ppsz_env = ppsz_env;    
-    SetDefaultConfiguration( p_data );
+    p_main->i_argc    = i_argc;
+    p_main->ppsz_argv = ppsz_argv;
+    p_main->ppsz_env  = ppsz_env;
+    SetDefaultConfiguration();
 
-    /* Parse command line */
+    /* Parse command line options */
     opterr = 0;
     while( ( c = getopt_long( i_argc, ppsz_argv, psz_shortopts, longopts, 0 ) ) != EOF )
     {
         switch( c )
         {
-        /* General/common options */   
-        case 'h':                                                /* -h, --help */
-            Usage();
+        /* General/common options */
+        case 'h':                                              /* -h, --help */
+            Usage( SHORT_HELP );
             return( -1 );
             break;
-        case OPT_DISPLAY:                                         /* --display */
-            p_data->vout_cfg.psz_display = optarg;
-            p_data->vout_cfg.i_properties |= VIDEO_CFG_DISPLAY;
-            p_data->intf_thread.xconsole.psz_display = optarg;
-            break;
-
-        /* Interface options */
-        case OPT_CONSOLE_DISPLAY:                         /* --console-display */
-            p_data->intf_thread.xconsole.psz_display = optarg;
+        case 'H':                                          /* -H, --longhelp */
+            Usage( LONG_HELP );
+            return( -1 );
             break;
-        case OPT_CONSOLE_GEOMETRY:                       /* --console-geometry */
-            p_data->intf_thread.xconsole.psz_geometry = optarg;
+        case 'v':                                           /* -v, --version */
+            Version();
+            return( -1 );
             break;
 
         /* Audio options */
-        case OPT_NOAUDIO:                                        /* --noaudio */
-           p_data->cfg.b_audio = 0;
+        case OPT_NOAUDIO:                                       /* --noaudio */
+            p_main->b_audio = 0;
             break;
-        case OPT_STEREO:                                          /* --stereo */
-           p_data->aout_thread.dsp.b_stereo = 1;
+        case OPT_AOUT:                                             /* --aout */
+            main_PutPszVariable( AOUT_METHOD_VAR, optarg );
             break;
-        case OPT_MONO:                                              /* --mono */
-           p_data->aout_thread.dsp.b_stereo = 0;
+        case OPT_STEREO:                                         /* --stereo */
+            main_PutIntVariable( AOUT_STEREO_VAR, 1 );
             break;
-        case OPT_RATE:                                              /* --rate */
-           p_data->aout_thread.dsp.l_rate = GetIntParam(optarg, AOUT_MIN_RATE, AOUT_MAX_RATE, &i_err );
-            if( i_err )
-            {
-                return( EINVAL );
-           }
+        case OPT_MONO:                                             /* --mono */
+            main_PutIntVariable( AOUT_STEREO_VAR, 0 );
             break;
 
         /* Video options */
-        case OPT_NOVIDEO:                                         /* --novideo */
-            p_data->cfg.b_video = 0;
-            break;       
-        case OPT_XSHM:                                               /* --xshm */
-            p_data->vout_cfg.b_shm_ext = 1;
-            p_data->vout_cfg.i_properties |= VIDEO_CFG_SHM_EXT;
+        case OPT_NOVIDEO:                                       /* --novideo */
+            p_main->b_video = 0;
             break;
-        case OPT_NOXSHM:                                           /* --noxshm */
-            p_data->vout_cfg.b_shm_ext = 0;
-            p_data->vout_cfg.i_properties |= VIDEO_CFG_SHM_EXT;
+        case OPT_VOUT:                                             /* --vout */
+            main_PutPszVariable( VOUT_METHOD_VAR, optarg );
+            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;
+        case OPT_COLOR:                                           /* --color */
+            main_PutIntVariable( VOUT_GRAYSCALE_VAR, 0 );
+            break;
+
+        /* DVD options */
+        case 'a':
+            if ( ! strcmp(optarg, "mpeg") )
+                main_PutIntVariable( INPUT_DVD_AUDIO_VAR, REQUESTED_MPEG );
+            else if ( ! strcmp(optarg, "lpcm") )
+                main_PutIntVariable( INPUT_DVD_AUDIO_VAR, REQUESTED_LPCM );
+            else if ( ! strcmp(optarg, "off") )
+                main_PutIntVariable( INPUT_DVD_AUDIO_VAR, REQUESTED_NOAUDIO );
+            else
+                main_PutIntVariable( INPUT_DVD_AUDIO_VAR, REQUESTED_AC3 );
+            break;
+        case 'c':
+            main_PutIntVariable( INPUT_DVD_CHANNEL_VAR, atoi(optarg) );
+            break;
+        case 's':
+            main_PutIntVariable( INPUT_DVD_SUBTITLE_VAR, atoi(optarg) );
             break;
 
-        /* VLAN management options */
-        case OPT_NOVLANS:                                         /* --novlans */
-            p_data->cfg.b_vlans = 0;
+        /* Input options */
+        case OPT_NOVLANS:                                       /* --novlans */
+            p_main->b_vlans = 0;
             break;
-        case  OPT_VLAN_SERVER:                                 /* --vlanserver */
-            p_data->cfg.i_input_vlan_server_port = ServerPort( optarg );
-            p_data->cfg.psz_input_vlan_server = optarg;
+        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 '?':                          
+        case '?':
         default:
-            intf_ErrMsg("intf error: unknown option '%s'\n", ppsz_argv[optind - 1]);
+            intf_ErrMsg( "intf error: unknown option `%s'\n", ppsz_argv[optind - 1] );
+            Usage( USAGE );
             return( EINVAL );
             break;
         }
     }
 
+    /* Parse command line parameters - no check is made for these options */
+    for( i_opt = optind; i_opt < i_argc; i_opt++ )
+    {
+        putenv( ppsz_argv[ i_opt ] );
+    }
     return( 0 );
 }
 
-/*******************************************************************************
+/*****************************************************************************
  * Usage: print program usage
- *******************************************************************************
+ *****************************************************************************
  * Print a short inline help. Message interface is initialized at this stage.
- *******************************************************************************/
-static void Usage( void )
+ *****************************************************************************/
+static void Usage( int i_fashion )
 {
-    intf_Msg(COPYRIGHT_MESSAGE);
-    /* General options */
-    intf_Msg("usage: vlc [options...]\n" \
-             "  -h, --help                      print usage\n" \
-             );
-    /* Audio options */
-    intf_Msg("  --noaudio                       disable audio\n" \
-             "  --stereo                        enable stereo\n" \
-             "  --mono                          disable stereo\n"
-             "  --rate <rate>                   audio output rate (kHz)\n" \
-             );
-    /* Video options */
-    intf_Msg("  --novideo                       disable video\n" \
-             "  --xshm, --noxshm                enable/disable use of XShm extension\n" \
-             "  -d, --display <display>         set display name\n" \
-             );
-
-    /* VLAN management options */
-    intf_Msg("  --novlans                              disable vlans\n" \
-             "  --vlanserver <server[:port]>   set vlan server address\n" \
-             );
+    /* Usage */
+    intf_Msg( "Usage: vlc [options] [parameters] [file]...\n" );
+
+    if( i_fashion == USAGE )
+    {
+        intf_Msg( "Try `vlc --help' for more information.\n" );
+        return;
+    }
+
+    intf_MsgImm( COPYRIGHT_MESSAGE "\n" );
+
+    /* Options */
+    intf_Msg( "\n"
+              "Options:\n"
+              "      --noaudio                  \tdisable audio\n"
+              "      --aout <plugin>            \taudio output method\n"
+              "      --stereo, --mono           \tstereo/mono audio\n"
+              "\n"
+              "      --novideo                  \tdisable video\n"
+              "      --vout <plugin>            \tvideo output method\n"
+              "      --display <display>        \tdisplay string\n"
+              "      --width <w>, --height <h>  \tdisplay dimensions\n"
+              "  -g, --grayscale                \tgrayscale output\n"
+              "      --color                    \tcolor output\n"
+              "\n"
+              "  -a, --dvdaudio                 \tchoose DVD audio type\n"
+              "  -c, --dvdchannel               \tchoose DVD audio channel\n"
+              "  -s, --dvdsubtitle              \tchoose DVD subtitle channel\n"
+              "\n"
+              "      --novlans                  \tdisable vlans\n"
+              "      --server <host>            \tvideo server address\n"
+              "      --port <port>              \tvideo server port\n"
+              "\n"
+              "  -h, --help                     \tprint help and exit\n"
+              "  -H, --longhelp                 \tprint long help and exit\n"
+              "  -v, --version                  \toutput version information and exit\n" );
+
+    if( i_fashion == SHORT_HELP )
+        return;
+
+    /* Interface parameters */
+    intf_Msg( "\n"
+              "Interface parameters:\n"
+              "  " INTF_INIT_SCRIPT_VAR "=<filename>             \tinitialization script\n"
+              "  " INTF_CHANNELS_VAR "=<filename>            \tchannels list\n" );
+
+    /* Audio parameters */
+    intf_Msg( "\n"
+              "Audio parameters:\n"
+              "  " AOUT_METHOD_VAR "=<method name>        \taudio method\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( "\n"
+              "Video parameters:\n"
+              "  " VOUT_METHOD_VAR "=<method name>        \tdisplay method\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" );
+
+    /* DVD parameters */
+    intf_Msg( "\n"
+              "DVD parameters:\n"
+              "  " INPUT_DVD_AUDIO_VAR "={ac3|lpcm|mpeg|off} \taudio type\n"
+              "  " INPUT_DVD_CHANNEL_VAR "=[0-15]            \taudio channel\n"
+              "  " INPUT_DVD_SUBTITLE_VAR "=[0-31]           \tsubtitle channel\n" );
+
+    /* Input parameters */
+    intf_Msg( "\n"
+              "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" );
 }
 
-/*******************************************************************************
- * GetIntParam: convert a string to an integer
- *******************************************************************************
- * This function convert a string to an integer, check range of the value
- * and that there is no error during convertion. pi_err is a pointer to an
- * error flag, which contains non 0 on error. This function prints its own
- * error messages.
- *******************************************************************************/
-static long GetIntParam( const char *psz_param, long i_min, long i_max, int *pi_err )
+/*****************************************************************************
+ * Version: print complete program version
+ *****************************************************************************
+ * Print complete program version and build number.
+ *****************************************************************************/
+static void Version( void )
 {
-    char *psz_endptr;
-    long int i_value;
+    intf_Msg( VERSION_MESSAGE
+              "This program comes with NO WARRANTY, to the extent permitted by law.\n"
+              "You may redistribute it under the terms of the GNU General Public License;\n"
+              "see the file named COPYING for details.\n"
+              "Written by the VideoLAN team at Ecole Centrale, Paris.\n" );
 
-    i_value = strtol( psz_param, &psz_endptr, 0 );
-    if( (psz_param[0] == '\0') && (*psz_endptr != '\0') )  /* conversion error */
-    {
-        intf_ErrMsg("intf error: conversion error ('%s' should be an integer between %ld and %ld)\n",
-                    psz_param, i_min, i_max );
-        *pi_err = EINVAL;
-        return( 0 );
-    }
-    if( (i_value < i_min) || (i_value > i_max) )                /* range error */
-    {
-        intf_ErrMsg("intf error: range error ('%s' should be an integer between %ld and %ld)\n",
-                    psz_param, i_min, i_max );
-        *pi_err = EINVAL;
-        return( 0 );
-    }
-    *pi_err = 0;
-    return( i_value );
 }
-/*******************************************************************************
+
+/*****************************************************************************
  * InitSignalHandler: system signal handler initialization
- *******************************************************************************
+ *****************************************************************************
  * Set the signal handlers. SIGTERM is not intercepted, because we need at
- * at least a method to kill the program when all other methods failed, and 
+ * at least a method to kill the program when all other methods failed, and
  * when we don't want to use SIGKILL.
- *******************************************************************************/
+ *****************************************************************************/
 static void InitSignalHandler( void )
 {
-  /* Termination signals */
-  signal( SIGHUP, SignalHandler );
-  signal( SIGINT, SignalHandler );
-  signal( SIGQUIT, SignalHandler );
+    /* Termination signals */
+    signal( SIGHUP,  SignalHandler );
+    signal( SIGINT,  SignalHandler );
+    signal( SIGQUIT, SignalHandler );
 }
 
-/*******************************************************************************
+/*****************************************************************************
  * SignalHandler: system signal handler
- *******************************************************************************
- * This function is called when a signal is received by the program. It ignores
- * it or tries to terminate cleanly.
- *******************************************************************************/
+ *****************************************************************************
+ * This function is called when a signal is received by the program. It tries to
+ * end the program in a clean way.
+ *****************************************************************************/
 static void SignalHandler( int i_signal )
 {
-  /* Once a signal has been trapped, the signal handler needs to be re-armed on
-   * linux systems */
-  signal( i_signal, SignalHandler );
+    /* Once a signal has been trapped, the termination sequence will be armed and
+     * following signals will be ignored to avoid sending messages to an interface
+     * having been destroyed */
+    signal( SIGHUP,  SIG_IGN );
+    signal( SIGINT,  SIG_IGN );
+    signal( SIGQUIT, SIG_IGN );
+
+    /* Acknowledge the signal received */
+    intf_ErrMsgImm("intf: signal %d received\n", i_signal );
+
+    /* Try to terminate everything - this is done by requesting the end of the
+     * interface thread */
+    p_main->p_intf->b_die = 1;
+}
+
+#ifdef HAVE_MMX
+/*****************************************************************************
+ * TestMMX: tests if the processor has MMX support.
+ *****************************************************************************
+ * This function is called if HAVE_MMX is enabled, to check whether the
+ * CPU really supports MMX.
+ *****************************************************************************/
+static int TestMMX( void )
+{
+/* FIXME: under beos, gcc does not support the following inline assembly */ 
+#ifdef SYS_BEOS
+    return( 1 );
+#else
+
+    int i_reg, i_dummy = 0;
+
+    /* test for a 386 CPU */
+    asm volatile ( "pushfl
+                    popl %%eax
+                    movl %%eax, %%ecx
+                    xorl $0x40000, %%eax
+                    pushl %%eax
+                    popfl
+                    pushfl
+                    popl %%eax
+                    xorl %%ecx, %%eax
+                    andl $0x40000, %%eax"
+                 : "=a" ( i_reg ) );
+
+    if( !i_reg )
+        return( 0 );
+
+    /* test for a 486 CPU */
+    asm volatile ( "movl %%ecx, %%eax
+                    xorl $0x200000, %%eax
+                    pushl %%eax
+                    popfl
+                    pushfl
+                    popl %%eax
+                    xorl %%ecx, %%eax
+                    pushl %%ecx
+                    popfl
+                    andl $0x200000, %%eax"
+                 : "=a" ( i_reg ) );
+
+    if( !i_reg )
+        return( 0 );
+
+    /* the CPU supports the CPUID instruction - get its level */
+    asm volatile ( "cpuid"
+                 : "=a" ( i_reg ),
+                   "=b" ( i_dummy ),
+                   "=c" ( i_dummy ),
+                   "=d" ( i_dummy )
+                 : "a"  ( 0 ),       /* level 0 */
+                   "b"  ( i_dummy ) ); /* buggy compiler shouldn't complain */
+
+    /* this shouldn't happen on a normal CPU */
+    if( !i_reg )
+        return( 0 );
+
+    /* test for the MMX flag */
+    asm volatile ( "cpuid
+                    andl $0x00800000, %%edx" /* X86_FEATURE_MMX */
+                 : "=a" ( i_dummy ),
+                   "=b" ( i_dummy ),
+                   "=c" ( i_dummy ),
+                   "=d" ( i_reg )
+                 : "a"  ( 1 ),       /* level 1 */
+                   "b"  ( i_dummy ) ); /* buggy compiler shouldn't complain */
+
+    if( !i_reg )
+        return( 0 );
 
-  /* Acknowledge the signal received */
-  intf_ErrMsgImm("intf: signal %d received\n", i_signal );
+    return( 1 );
 
-  /* Try to terminate everything */
-  /* ?? this probably needs to be changed */
- /*  p_program_data->intf_thread.b_die = 1; */
+#endif
 }
+#endif