* and spawn threads.
*****************************************************************************
* Copyright (C) 1998, 1999, 2000 VideoLAN
- * $Id: main.c,v 1.85 2001/04/12 01:52:45 sam Exp $
+ * $Id: main.c,v 1.99 2001/05/31 01:37:08 sam Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
# include <mach/bootstrap.h>
#endif
+#ifndef WIN32
+#include <netinet/in.h> /* BSD: struct in_addr */
+#endif
+
+#ifdef HAVE_UNISTD_H
#include <unistd.h>
+#endif
+
#include <errno.h> /* ENOMEM */
#include <stdlib.h> /* getenv(), strtol(), */
#include <string.h> /* strerror() */
#define OPT_NOAUDIO 150
#define OPT_STEREO 151
#define OPT_MONO 152
+#define OPT_SPDIF 153
#define OPT_NOVIDEO 160
#define OPT_DISPLAY 161
#define OPT_MOTION 181
#define OPT_IDCT 182
#define OPT_YUV 183
+#define OPT_DOWNMIX 184
+#define OPT_IMDCT 185
#define OPT_SYNCHRO 190
#define OPT_WARNING 191
{ "aout", 1, 0, 'A' },
{ "stereo", 0, 0, OPT_STEREO },
{ "mono", 0, 0, OPT_MONO },
+ { "spdif", 0, 0, OPT_SPDIF },
+ { "downmix", 1, 0, OPT_DOWNMIX },
+ { "imdct", 1, 0, OPT_IMDCT },
/* Video options */
{ "novideo", 0, 0, OPT_NOVIDEO },
/* DVD options */
{ "dvdtitle", 1, 0, 't' },
{ "dvdchapter", 1, 0, 'T' },
+ { "dvdangle", 1, 0, 'u' },
{ "dvdaudio", 1, 0, 'a' },
{ "dvdchannel", 1, 0, 'c' },
{ "dvdsubtitle", 1, 0, 's' },
/* Input options */
{ "input", 1, 0, OPT_INPUT },
- { "channels", 0, 0, OPT_CHANNELS },
{ "server", 1, 0, OPT_SERVER },
{ "port", 1, 0, OPT_PORT },
- { "broadcast", 0, 0, OPT_BROADCAST },
+ { "broadcast", 1, 0, OPT_BROADCAST },
+ { "channels", 0, 0, OPT_CHANNELS },
/* Synchro options */
{ "synchro", 1, 0, OPT_SYNCHRO },
};
/* Short options */
-static const char *psz_shortopts = "hHvgt:T:a:s:c:I:A:V:";
+static const char *psz_shortopts = "hHvgt:T:u:a:s:c:I:A:V:";
/*****************************************************************************
- * Global variable program_data - this is the one and only, see main.h
+ * Global variable program_data - these are the only ones, see main.h and
+ * modules.h
*****************************************************************************/
-main_t *p_main;
+main_t *p_main;
+module_bank_t *p_module_bank;
+aout_bank_t *p_aout_bank;
+vout_bank_t *p_vout_bank;
/*****************************************************************************
* Local prototypes
*****************************************************************************/
int main( int i_argc, char *ppsz_argv[], char *ppsz_env[] )
{
- main_t main_data; /* root of all data - see main.h */
+ main_t main_data; /* root of all data - see main.h */
+ module_bank_t module_bank;
+ aout_bank_t aout_bank;
+ vout_bank_t vout_bank;
- p_main = &main_data; /* set up the global variable */
+ p_main = &main_data; /* set up the global variables */
+ p_module_bank = &module_bank;
+ p_aout_bank = &aout_bank;
+ p_vout_bank = &vout_bank;
/*
- * System specific initialization code
+ * Test if our code is likely to run on this CPU
*/
-#if defined( SYS_BEOS ) || defined( SYS_DARWIN1_3 )
- system_Create( &i_argc, ppsz_argv, ppsz_env );
-#endif
-
p_main->i_cpu_capabilities = CPUCapabilities();
- /*
- * Test if our code is likely to run on this CPU
- */
#if defined( __pentium__ ) || defined( __pentiumpro__ )
if( ! TestCPU( CPU_CAPABILITY_586 ) )
{
}
#endif
-#ifdef HAVE_MMX
- if( ! TestCPU( CPU_CAPABILITY_MMX ) )
- {
- fprintf( stderr, "error: this program needs MMX extensions,\n"
- "please try a version without MMX support\n" );
- return( 1 );
- }
+ /*
+ * System specific initialization code
+ */
+#if defined( SYS_BEOS ) || defined( SYS_DARWIN1_3 )
+ system_Init( &i_argc, ppsz_argv, ppsz_env );
#endif
/*
/*
* Read configuration
*/
- if( GetConfiguration( &i_argc, ppsz_argv, ppsz_env ) ) /* parse cmd line */
+ if( GetConfiguration( &i_argc, ppsz_argv, ppsz_env ) ) /* parse cmd line */
{
intf_MsgDestroy();
return( errno );
/*
* Initialize playlist and get commandline files
*/
- p_main->p_playlist = intf_PlaylistCreate( );
+ p_main->p_playlist = intf_PlaylistCreate();
if( !p_main->p_playlist )
{
intf_ErrMsg( "playlist error: playlist initialization failed" );
GetFilenames( i_argc, ppsz_argv );
/*
- * Initialize module bank
+ * Initialize module, aout and vout banks
*/
- p_main->p_bank = module_CreateBank( );
- if( !p_main->p_bank )
- {
- intf_ErrMsg( "module error: module bank initialization failed" );
- intf_PlaylistDestroy( p_main->p_playlist );
- intf_MsgDestroy();
- return( errno );
- }
- module_InitBank( p_main->p_bank );
+ module_InitBank();
+ aout_InitBank();
+ vout_InitBank();
/*
* Initialize shared resources and libraries
*/
- if( p_main->b_channels && network_ChannelCreate() )
+ if( main_GetIntVariable( INPUT_NETWORK_CHANNEL_VAR,
+ INPUT_NETWORK_CHANNEL_DEFAULT ) &&
+ network_ChannelCreate() )
{
/* On error during Channels initialization, switch off channels */
intf_Msg( "Channels initialization failed : "
"Channel management is deactivated" );
- p_main->b_channels = 0;
+ main_PutIntVariable( INPUT_NETWORK_CHANNEL_VAR, 0 );
}
/*
- * Run interface
+ * Try to run the interface
*/
p_main->p_intf = intf_Create();
- if( !p_main->p_intf )
+ if( p_main->p_intf == NULL )
{
intf_ErrMsg( "intf error: interface initialization failed" );
- module_DestroyBank( p_main->p_bank );
- intf_PlaylistDestroy( p_main->p_playlist );
- intf_MsgDestroy();
- return( errno );
- }
-
- /*
- * Set signal handling policy for all threads
- */
- InitSignalHandler();
-
- /*
- * Open audio device and start 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 off audio */
- intf_ErrMsg( "aout error: audio initialization failed,"
- " audio is deactivated" );
- p_main->b_audio = 0;
- }
}
-
- /*
- * Open video device and start vout thread
- */
- if( p_main->b_video )
+ else
{
- p_main->p_vout = vout_CreateThread( NULL );
- if( p_main->p_vout == NULL )
+ /*
+ * Set signal handling policy for all threads
+ */
+ InitSignalHandler();
+
+ /*
+ * This is the main loop
+ */
+ p_main->p_intf->pf_run( p_main->p_intf );
+
+ /*
+ * Finished, destroy the interface
+ */
+ intf_Destroy( p_main->p_intf );
+
+ /*
+ * Go back into channel 0 which is the network
+ */
+ if( main_GetIntVariable( INPUT_NETWORK_CHANNEL_VAR,
+ INPUT_NETWORK_CHANNEL_DEFAULT ) )
{
- /* On error during video initialization, switch off video */
- intf_ErrMsg( "vout error: video initialization failed,"
- " video is deactivated" );
- p_main->b_video = 0;
+ network_ChannelJoin( COMMON_CHANNEL );
}
}
- /* Flush messages before entering the main loop */
- intf_FlushMsg();
-
- /*
- * This is the main loop
- */
- p_main->p_intf->pf_run( p_main->p_intf );
-
- intf_Destroy( p_main->p_intf );
-
- /*
- * Close video device
- */
- if( p_main->b_video )
- {
- vout_DestroyThread( p_main->p_vout, NULL );
- }
-
- /*
- * Close audio device
- */
- if( p_main->b_audio )
- {
- aout_DestroyThread( p_main->p_aout, NULL );
- }
-
- /*
- * Go back into channel 0 which is the network
- */
- if( p_main->b_channels )
- {
- network_ChannelJoin( COMMON_CHANNEL );
- }
-
/*
- * Free module bank
+ * Free module, aout and vout banks
*/
- module_DestroyBank( p_main->p_bank );
+ vout_EndBank();
+ aout_EndBank();
+ module_EndBank();
/*
* Free playlist
* System specific cleaning code
*/
#if defined( SYS_BEOS ) || defined( SYS_DARWIN1_3 )
- system_Destroy();
+ system_End();
#endif
/*
intf_Msg( "intf: program terminated" );
intf_MsgDestroy();
- return( 0 );
+ return 0;
}
/*****************************************************************************
p_main->b_audio = 1;
p_main->b_video = 1;
- p_main->b_channels = 0;
- p_main->i_warning_level = 4;
+ p_main->i_warning_level = 0;
+
+ p_main->p_channel = NULL;
/* Get the executable name (similar to the basename command) */
p_main->psz_arg0 = p_tmp = ppsz_argv[ 0 ];
/* When vlc.app is run by double clicking in Mac OS X, the 2nd arg
* is the PSN - process serial number (a unique PID-ish thingie)
* still ok for real Darwin & when run from command line */
- if ( strncmp( ppsz_argv[ 1 ] , "-psn" , 4) == 0 )
- /* for example -psn_0_9306113 */
+ if ( (*pi_argc > 1) && (strncmp( ppsz_argv[ 1 ] , "-psn" , 4 ) == 0) )
+ /* for example -psn_0_9306113 */
{
/* GDMF!... I can't do this or else the MacOSX window server will
* not pick up the PSN and not register the app and we crash...
return( -1 );
break;
case 'v': /* -v, --verbose */
- p_main->i_warning_level--;
+ p_main->i_warning_level++;
break;
/* Interface warning messages level */
case OPT_MONO: /* --mono */
main_PutIntVariable( AOUT_STEREO_VAR, 0 );
break;
+ case OPT_SPDIF: /* --spdif */
+ main_PutIntVariable( AOUT_SPDIF_VAR, 1 );
+ break;
+ case OPT_DOWNMIX: /* --downmix */
+ main_PutPszVariable( DOWNMIX_METHOD_VAR, optarg );
+ break;
+ case OPT_IMDCT: /* --imdct */
+ main_PutPszVariable( IMDCT_METHOD_VAR, optarg );
+ break;
/* Video options */
case OPT_NOVIDEO: /* --novideo */
case 'T':
main_PutIntVariable( INPUT_CHAPTER_VAR, atoi(optarg) );
break;
+ case 'u':
+ main_PutIntVariable( INPUT_ANGLE_VAR, atoi(optarg) );
+ break;
case 'a':
if ( ! strcmp(optarg, "ac3") )
main_PutIntVariable( INPUT_AUDIO_VAR, REQUESTED_AC3 );
main_PutPszVariable( INPUT_METHOD_VAR, optarg );
break;
case OPT_CHANNELS: /* --channels */
- p_main->b_channels = 1;
+ main_PutIntVariable( INPUT_NETWORK_CHANNEL_VAR, 1 );
break;
case OPT_SERVER: /* --server */
main_PutPszVariable( INPUT_SERVER_VAR, optarg );
break;
case OPT_BROADCAST: /* --broadcast */
main_PutIntVariable( INPUT_BROADCAST_VAR, 1 );
+ main_PutPszVariable( INPUT_BCAST_ADDR_VAR, optarg );
break;
/* Synchro options */
"\n --noaudio \tdisable audio"
"\n -A, --aout <module> \taudio output method"
"\n --stereo, --mono \tstereo/mono audio"
+ "\n --spdif \tAC3 pass-through mode"
+ "\n --downmix <module> \tAC3 downmix method"
+ "\n --imdct <module> \tAC3 IMDCT method"
"\n"
"\n --novideo \tdisable video"
"\n -V, --vout <module> \tvideo output method"
"\n"
"\n -t, --dvdtitle <num> \tchoose DVD title"
"\n -T, --dvdchapter <num> \tchoose DVD chapter"
+ "\n -u, --dvdangle <num> \tchoose DVD angle"
"\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 --input \tinput method"
- "\n --channels \tenable channels"
+ "\n --channels \tenable channels"
"\n --server <host> \tvideo server address"
"\n --port <port> \tvideo server port"
"\n --broadcast \tlisten to a broadcast"
"\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_SPDIF_VAR "={1|0} \tAC3 pass-through mode"
+ "\n " DOWNMIX_METHOD_VAR "=<method name> \tAC3 downmix method"
+ "\n " IMDCT_METHOD_VAR "=<method name> \tAC3 IMDCT method"
"\n " AOUT_RATE_VAR "=<rate> \toutput rate" );
/* Video parameters */
"\n " INPUT_DVD_DEVICE_VAR "=<device> \tDVD device"
"\n " INPUT_TITLE_VAR "=<title> \ttitle number"
"\n " INPUT_CHAPTER_VAR "=<chapter> \tchapter number"
+ "\n " INPUT_ANGLE_VAR "=<angle> \tangle number"
"\n " INPUT_AUDIO_VAR "={ac3|lpcm|mpeg|off} \taudio type"
"\n " INPUT_CHANNEL_VAR "=[0-15] \taudio channel"
"\n " INPUT_SUBTITLE_VAR "=[0-31] \tsubtitle channel" );
/* Input parameters */
intf_MsgImm( "\nInput 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_BROADCAST_VAR "={1|0} \tbroadcast mode"
- "\n " INPUT_CHANNEL_SERVER_VAR "=<hostname> \tchannel server"
- "\n " INPUT_CHANNEL_PORT_VAR "=<port> \tchannel server port" );
+ "\n " INPUT_SERVER_VAR "=<hostname> \tvideo server"
+ "\n " INPUT_PORT_VAR "=<port> \tvideo server port"
+ "\n " INPUT_IFACE_VAR "=<interface> \tnetwork interface"
+ "\n " INPUT_BCAST_ADDR_VAR "=<addr> \tbroadcast mode"
+ "\n " INPUT_CHANNEL_SERVER_VAR "=<hostname> \tchannel server"
+ "\n " INPUT_CHANNEL_PORT_VAR "=<port> \tchannel server port" );
}
static void InitSignalHandler( void )
{
/* Termination signals */
- signal( SIGHUP, FatalSignalHandler );
+#ifndef WIN32
signal( SIGINT, FatalSignalHandler );
+ signal( SIGHUP, FatalSignalHandler );
signal( SIGQUIT, FatalSignalHandler );
/* Other signals */
signal( SIGALRM, SimpleSignalHandler );
signal( SIGPIPE, SimpleSignalHandler );
+#endif
}
/* 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 );
+#ifndef WIN32
signal( SIGINT, SIG_IGN );
+ signal( SIGHUP, SIG_IGN );
signal( SIGQUIT, SIG_IGN );
+#endif
/* Acknowledge the signal received */
intf_ErrMsgImm( "intf error: signal %d received, exiting", i_signal );
if( i_edx & 0x02000000 )
{
i_capabilities |= CPU_CAPABILITY_MMXEXT;
+ i_capabilities |= CPU_CAPABILITY_SSE;
}
/* test for additional capabilities */
{
i_capabilities |= CPU_CAPABILITY_MMXEXT;
}
-
#else
/* default behaviour */
projects / vlc / blobdiff