#include "defs.h"
#include <signal.h> /* SIGHUP, SIGINT, SIGKILL */
-#include <getopt.h> /* getopt() */
#include <stdio.h> /* sprintf() */
+#ifdef HAVE_GETOPT_H
+#include <getopt.h> /* getopt() */
+#endif
+
#include <errno.h> /* ENOMEM */
#include <stdlib.h> /* getenv(), strtol(), */
#include <string.h> /* strerror() */
#include "common.h"
#include "threads.h"
#include "mtime.h"
+#include "tests.h" /* TestMMX() */
#include "plugins.h"
-#include "input_vlan.h"
-#include "input_file.h"
+#include "playlist.h"
+#include "stream_control.h"
+#include "input_ext-intf.h"
#include "intf_msg.h"
#include "interface.h"
#define OPT_WIDTH 163
#define OPT_HEIGHT 164
#define OPT_COLOR 165
+#define OPT_YUV 166
-#define OPT_NOVLANS 170
+#define OPT_VLANS 170
#define OPT_SERVER 171
#define OPT_PORT 172
+#define OPT_BROADCAST 173
+
+#define OPT_SYNCHRO 180
+
+#define OPT_WARNING 190
/* Usage fashion */
#define USAGE 0
#define LONG_HELP 2
/* Long options */
+#ifdef HAVE_GETOPT_H
static const struct option longopts[] =
{
/* name, has_arg, flag, val */
{ "height", 1, 0, OPT_HEIGHT },
{ "grayscale", 0, 0, 'g' },
{ "color", 0, 0, OPT_COLOR },
+ { "yuv", 1, 0, OPT_YUV },
/* DVD options */
{ "dvdaudio", 1, 0, 'a' },
{ "dvdsubtitle", 1, 0, 's' },
/* Input options */
- { "novlans", 0, 0, OPT_NOVLANS },
+ { "vlans", 0, 0, OPT_VLANS },
{ "server", 1, 0, OPT_SERVER },
{ "port", 1, 0, OPT_PORT },
+ { "broadcast", 0, 0, OPT_BROADCAST },
+
+ /* Synchro options */
+ { "synchro", 1, 0, OPT_SYNCHRO },
+ /* Interface messages */
+ { "warning", 1, 0, OPT_WARNING },
{ 0, 0, 0, 0 }
};
/* Short options */
static const char *psz_shortopts = "hHvga:s:c:";
+#endif
+
/*****************************************************************************
* Global variable program_data - this is the one and only, see main.h
* Local prototypes
*****************************************************************************/
static void SetDefaultConfiguration ( void );
-static int GetConfiguration ( int i_argc, char *ppsz_argv[], char *ppsz_env[] );
+static int GetConfiguration ( int i_argc, char *ppsz_argv[],
+ char *ppsz_env[] );
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 );
+ int TestMMX ( void );
#endif
/*****************************************************************************
*****************************************************************************
* Steps during program execution are:
* -configuration parsing and messages interface initialization
- * -openning of audio output device and some global modules
+ * -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 and some global modules
- * On error, the spawned threads are cancelled, and the open devices closed.
+ * On error, the spawned threads are canceled, and the open devices closed.
*****************************************************************************/
int main( int i_argc, char *ppsz_argv[], char *ppsz_env[] )
{
main_t main_data; /* root of all data - see main.h */
- char **p_playlist;
- int i_list_index;
p_main = &main_data; /* set up the global variable */
* System specific initialization code
*/
#ifdef SYS_BEOS
- beos_Init();
+ beos_Create();
#endif
/*
- * Read configuration, initialize messages interface and set up program
+ * Test if our code is likely to run on this CPU
*/
#ifdef HAVE_MMX
if( !TestMMX() )
{
- fprintf( stderr, "Sorry, this program needs an MMX processor. Please run the non-MMX version.\n" );
+ fprintf( stderr, "Sorry, this program needs an MMX processor. "
+ "Please run the non-MMX version.\n" );
return( 1 );
}
#endif
+
+ /*
+ * Initialize messages interface
+ */
p_main->p_msg = intf_MsgCreate();
if( !p_main->p_msg ) /* start messages interface */
{
- fprintf( stderr, "critical error: can't initialize messages interface (%s)\n",
+ fprintf( stderr, "error: can't initialize messages interface (%s)\n",
strerror(errno) );
return( errno );
}
+
+ /*
+ * Read configuration
+ */
if( GetConfiguration( i_argc, ppsz_argv, ppsz_env ) ) /* parse cmd line */
{
intf_MsgDestroy();
return( errno );
}
- /* get command line files */
- i_list_index = 0;
-
- if( optind < i_argc )
+ /*
+ * Initialize playlist and get commandline files
+ */
+ p_main->p_playlist = playlist_Create( );
+ if( !p_main->p_playlist )
{
- int i_index = 0;
- p_playlist = malloc( (i_list_index = i_argc - optind)
- * sizeof(int) );
-
- while( i_argc - i_index > optind )
- {
- p_playlist[ i_index ] = ppsz_argv[ i_argc - i_index - 1];
- i_index++;
- }
+ intf_Msg( "Playlist initialization failed\n" );
+ intf_MsgDestroy();
+ return( errno );
}
- else
+ playlist_Init( p_main->p_playlist, optind );
+
+ /*
+ * Initialize plugin bank
+ */
+ p_main->p_bank = bank_Create( );
+ if( !p_main->p_bank )
{
- p_playlist = malloc( sizeof(int) );
- p_playlist[ 0 ] = "-";
- i_list_index = 1;
+ intf_Msg( "Plugin bank initialization failed\n" );
+ playlist_Destroy( p_main->p_playlist );
+ intf_MsgDestroy();
+ return( errno );
}
-
- intf_MsgImm( COPYRIGHT_MESSAGE "\n" ); /* print welcome message */
+ bank_Init( p_main->p_bank );
/*
* Initialize shared resources and libraries
*/
- if( main_data.b_vlans && input_VlanCreate() )
+ /* FIXME: no VLANs */
+#if 0
+ if( p_main->b_vlans && input_VlanCreate() )
{
- /* On error during vlans initialization, switch of vlans */
- intf_Msg( "Virtual LANs initialization failed : vlans management is deactivated\n" );
- main_data.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;
}
+#endif
/*
* Open audio device and start aout thread
*/
- if( main_data.b_audio )
+ if( p_main->b_audio )
{
- main_data.p_aout = aout_CreateThread( NULL );
- if( main_data.p_aout == NULL )
+ p_main->p_aout = aout_CreateThread( NULL );
+ if( p_main->p_aout == NULL )
{
- /* On error during audio initialization, switch of audio */
+ /* On error during audio initialization, switch off audio */
intf_Msg( "Audio initialization failed : audio is deactivated\n" );
- main_data.b_audio = 0;
+ p_main->b_audio = 0;
}
}
/*
* Run interface
*/
- main_data.p_intf = intf_Create();
- if( main_data.p_intf != NULL )
+ p_main->p_intf = intf_Create();
+ if( p_main->p_intf != NULL )
{
- main_data.p_intf->p_playlist = p_playlist;
- main_data.p_intf->i_list_index = i_list_index;
-
InitSignalHandler(); /* prepare signals for interception */
- intf_Run( main_data.p_intf );
- intf_Destroy( main_data.p_intf );
+ /*
+ * This is the main loop
+ */
+ intf_Run( p_main->p_intf );
+
+ intf_Destroy( p_main->p_intf );
}
/*
* Close audio device
*/
- if( main_data.b_audio )
+ if( p_main->b_audio )
{
- aout_DestroyThread( main_data.p_aout, NULL );
+ aout_DestroyThread( p_main->p_aout, NULL );
}
/*
* Free shared resources and libraries
*/
- if( main_data.b_vlans )
+ /* FIXME */
+#if 0
+ if( p_main->b_vlans )
{
input_VlanDestroy();
}
+#endif
/*
- * System specific cleaning code
+ * Free plugin bank
+ */
+ bank_Destroy( p_main->p_bank );
+
+ /*
+ * Free playlist
*/
+ playlist_Destroy( p_main->p_playlist );
+
#ifdef SYS_BEOS
- beos_Clean();
+ /*
+ * System specific cleaning code
+ */
+ beos_Destroy();
#endif
/*
*/
intf_Msg( "Program terminated.\n" );
intf_MsgDestroy();
+
return( 0 );
}
static void SetDefaultConfiguration( void )
{
/*
- * All features are activated by default
+ * All features are activated by default execpted vlans
*/
p_main->b_audio = 1;
p_main->b_video = 1;
- p_main->b_vlans = 1;
+ p_main->b_vlans = 0;
}
/*****************************************************************************
static int GetConfiguration( int i_argc, char *ppsz_argv[], char *ppsz_env[] )
{
int c, i_opt;
+ char * p_pointer;
/* Set default configuration and copy arguments */
p_main->i_argc = i_argc;
p_main->ppsz_env = ppsz_env;
SetDefaultConfiguration();
+ intf_MsgImm( COPYRIGHT_MESSAGE "\n" );
+
+ /* Get the executable name (similar to the basename command) */
+ p_main->psz_arg0 = p_pointer = ppsz_argv[ 0 ];
+ while( *p_pointer )
+ {
+ if( *p_pointer == '/' )
+ {
+ p_main->psz_arg0 = ++p_pointer;
+ }
+ else
+ {
+ ++p_pointer;
+ }
+ }
+
/* Parse command line options */
+#ifdef HAVE_GETOPT_H
opterr = 0;
while( ( c = getopt_long( i_argc, ppsz_argv, psz_shortopts, longopts, 0 ) ) != EOF )
{
case OPT_COLOR: /* --color */
main_PutIntVariable( VOUT_GRAYSCALE_VAR, 0 );
break;
+ case OPT_YUV: /* --yuv */
+ main_PutPszVariable( YUV_METHOD_VAR, optarg );
+ break;
+ /* FIXME */
+#if 0
/* DVD options */
case 'a':
if ( ! strcmp(optarg, "mpeg") )
else
main_PutIntVariable( INPUT_DVD_AUDIO_VAR, REQUESTED_AC3 );
break;
+#endif
case 'c':
main_PutIntVariable( INPUT_DVD_CHANNEL_VAR, atoi(optarg) );
break;
break;
/* Input options */
- case OPT_NOVLANS: /* --novlans */
- p_main->b_vlans = 0;
+ case OPT_VLANS: /* --vlans */
+ p_main->b_vlans = 1;
break;
case OPT_SERVER: /* --server */
main_PutPszVariable( INPUT_SERVER_VAR, optarg );
case OPT_PORT: /* --port */
main_PutPszVariable( INPUT_PORT_VAR, optarg );
break;
+ case OPT_BROADCAST: /* --broadcast */
+ main_PutIntVariable( INPUT_BROADCAST_VAR, 1 );
+ break;
+
+ /* Synchro options */
+ case OPT_SYNCHRO:
+ main_PutPszVariable( VPAR_SYNCHRO_VAR, optarg );
+ break;
+ /* Interface warning messages level */
+ case OPT_WARNING: /* --warning */
+ main_PutIntVariable( INTF_WARNING_VAR, atoi(optarg) );
+ break;
+
/* Internal error: unknown option */
case '?':
default:
break;
}
}
+#endif
/* Parse command line parameters - no check is made for these options */
for( i_opt = optind; i_opt < i_argc; i_opt++ )
static void Usage( int i_fashion )
{
/* Usage */
- intf_Msg( "Usage: vlc [options] [parameters]\n" );
+ intf_Msg( "Usage: %s [options] [parameters] [file]...\n",
+ p_main->psz_arg0 );
if( i_fashion == USAGE )
{
- intf_Msg( "Try `vlc --help' for more information.\n" );
+ intf_Msg( "Try `%s --help' for more information.\n",
+ p_main->psz_arg0 );
return;
}
- intf_MsgImm( COPYRIGHT_MESSAGE "\n" );
-
/* Options */
intf_Msg( "\n"
"Options:\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"
+ " -a, --dvdaudio <type> \tchoose DVD audio type\n"
+ " -c, --dvdchannel <channel> \tchoose DVD audio channel\n"
+ " -s, --dvdsubtitle <channel> \tchoose DVD subtitle channel\n"
"\n"
- " --novlans \tdisable vlans\n"
+ " --vlans \tenable vlans\n"
" --server <host> \tvideo server address\n"
" --port <port> \tvideo server port\n"
+ " --broadcast \tlisten to a broadcast\n"
+ "\n"
+ " --synchro <type> \tforce synchro algorithm\n"
+ "\n"
+ " --warning <level> \tdisplay warning messages\n"
"\n"
" -h, --help \tprint help and exit\n"
" -H, --longhelp \tprint long help and exit\n"
/* Interface parameters */
intf_Msg( "\n"
"Interface parameters:\n"
- " " INTF_INIT_SCRIPT_VAR "=<filename> \tinitialization script\n"
- " " INTF_CHANNELS_VAR "=<filename> \tchannels list\n" );
+ " " INTF_INIT_SCRIPT_VAR "=<filename> \tinitialization script\n"
+ " " INTF_CHANNELS_VAR "=<filename> \tchannels list\n"
+ " " INTF_WARNING_VAR "=<level> \twarning level\n" );
/* Audio parameters */
intf_Msg( "\n"
" " INPUT_SERVER_VAR "=<hostname> \tvideo server\n"
" " INPUT_PORT_VAR "=<port> \tvideo server port\n"
" " INPUT_IFACE_VAR "=<interface> \tnetwork interface\n"
+ " " INPUT_BROADCAST_VAR "={1|0} \tbroadcast mode\n"
" " INPUT_VLAN_SERVER_VAR "=<hostname> \tvlan server\n"
" " INPUT_VLAN_PORT_VAR "=<port> \tvlan server port\n" );
+
+ /* Synchro parameters */
+ intf_Msg( "\n"
+ "Synchro parameters:\n"
+ " " VPAR_SYNCHRO_VAR "={I|I+|IP|IP+|IPB} \tsynchro algorithm\n");
}
/*****************************************************************************
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 foolowing 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 );
-
- return( 1 );
-
-#endif
-}
-#endif