* and spawn threads.
*****************************************************************************
* Copyright (C) 1998, 1999, 2000 VideoLAN
+ * $Id: main.c,v 1.91 2001/05/01 04:18:18 sam Exp $
*
- * Authors:
+ * Authors: Vincent Seguin <seguin@via.ecp.fr>
+ * Samuel Hocevar <sam@zoy.org>
*
* 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
#include <signal.h> /* SIGHUP, SIGINT, SIGKILL */
#include <stdio.h> /* sprintf() */
-#ifdef HAVE_GETOPT_H
-#include <getopt.h> /* getopt() */
+#ifdef HAVE_GETOPT_LONG
+# ifdef HAVE_GETOPT_H
+# include <getopt.h> /* getopt() */
+# endif
+#else
+# include "GNUgetopt/getopt.h"
#endif
#ifdef SYS_DARWIN1_3
-#include <Carbon/Carbon.h> /* Altivec detection */
+# include <mach/mach.h> /* Altivec detection */
+# include <mach/mach_error.h> /* some day the header files||compiler *
+ will define it for us */
+# include <mach/bootstrap.h>
#endif
#include <unistd.h>
#include "video_output.h"
#ifdef SYS_BEOS
-#include "beos_specific.h"
+# include "beos_specific.h"
+#endif
+
+#ifdef SYS_DARWIN1_3
+# include "darwin_specific.h"
#endif
+#include "netutils.h" /* network_ChannelJoin */
+
#include "main.h"
/*****************************************************************************
#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_FULLSCREEN 165
#define OPT_OVERLAY 166
-#define OPT_VLANS 170
+#define OPT_CHANNELS 170
#define OPT_SERVER 171
#define OPT_PORT 172
#define OPT_BROADCAST 173
#define OPT_SYNCHRO 190
#define OPT_WARNING 191
+#define OPT_VERSION 192
/* 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 */
/* General/common options */
{ "help", 0, 0, 'h' },
{ "longhelp", 0, 0, 'H' },
- { "version", 0, 0, 'v' },
+ { "version", 0, 0, OPT_VERSION },
/* Interface options */
{ "intf", 1, 0, 'I' },
{ "aout", 1, 0, 'A' },
{ "stereo", 0, 0, OPT_STEREO },
{ "mono", 0, 0, OPT_MONO },
+ { "spdif", 0, 0, OPT_SPDIF },
/* 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 },
- { "vlans", 0, 0, OPT_VLANS },
+ { "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 },
/* Synchro options */
{ "synchro", 1, 0, OPT_SYNCHRO },
};
/* Short options */
-static const char *psz_shortopts = "hHvgt:T:a:s:c:I:A:V:";
-#endif
-
+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;
+bank_t *p_bank;
/*****************************************************************************
* Local prototypes
*****************************************************************************/
-static void SetDefaultConfiguration ( void );
-static int GetConfiguration ( int i_argc, char *ppsz_argv[],
+static int GetConfiguration ( int *pi_argc, char *ppsz_argv[],
char *ppsz_env[] );
static int GetFilenames ( int i_argc, char *ppsz_argv[] );
static void Usage ( int i_fashion );
int main( int i_argc, char *ppsz_argv[], char *ppsz_env[] )
{
main_t main_data; /* root of all data - see main.h */
+ bank_t module_bank;
- p_main = &main_data; /* set up the global variable */
+ p_main = &main_data; /* set up the global variables */
+ p_bank = &module_bank;
+
+ /*
+ * Initialize the main structure
+ */
+ p_main->i_cpu_capabilities = CPUCapabilities();
+
+ p_main->p_aout = NULL;
+ p_main->p_vout = NULL;
/*
* System specific initialization code
*/
-#ifdef SYS_BEOS
- beos_Create();
+#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
*/
/*
* 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 );
}
- p_main->i_warning_level = main_GetIntVariable( INTF_WARNING_VAR,
- INTF_WARNING_DEFAULT );
-
/*
* 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" );
/*
* Initialize module bank
*/
- 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();
/*
* Initialize shared resources and libraries
*/
- /* FIXME: no VLANs */
-#if 0
- if( p_main->b_vlans && input_VlanCreate() )
+ if( p_main->b_channels && network_ChannelCreate() )
{
- /* On error during vlans initialization, switch off vlans */
- intf_Msg( "Virtual LANs initialization failed : "
- "vlans management is deactivated" );
- p_main->b_vlans = 0;
+ /* On error during Channels initialization, switch off channels */
+ intf_Msg( "Channels initialization failed : "
+ "Channel management is deactivated" );
+ p_main->b_channels = 0;
}
-#endif
/*
* Run interface
if( !p_main->p_intf )
{
intf_ErrMsg( "intf error: interface initialization failed" );
- module_DestroyBank( p_main->p_bank );
+ module_EndBank();
intf_PlaylistDestroy( p_main->p_playlist );
intf_MsgDestroy();
return( errno );
*/
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 )
- {
- p_main->p_vout = vout_CreateThread( NULL );
- if( p_main->p_vout == NULL )
- {
- /* On error during video initialization, switch off video */
- intf_ErrMsg( "vout error: video initialization failed,"
- " video is deactivated" );
- p_main->b_video = 0;
- }
- }
-
- /* Flush messages before entering the main loop */
- intf_FlushMsg();
-
/*
* 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 );
/*
- * Close video device
+ * Close all video devices
*/
- if( p_main->b_video )
+ if( p_main->p_vout != NULL )
{
vout_DestroyThread( p_main->p_vout, NULL );
}
/*
- * Close audio device
+ * Close all audio devices
*/
- if( p_main->b_audio )
+ if( p_main->p_aout != NULL )
{
aout_DestroyThread( p_main->p_aout, NULL );
}
/*
- * Free shared resources and libraries
+ * Go back into channel 0 which is the network
*/
- /* FIXME */
-#if 0
- if( p_main->b_vlans )
+ if( p_main->b_channels )
{
- input_VlanDestroy();
+ network_ChannelJoin( COMMON_CHANNEL );
}
-#endif
/*
* Free module bank
*/
- module_DestroyBank( p_main->p_bank );
+ module_EndBank();
/*
* Free playlist
*/
intf_PlaylistDestroy( p_main->p_playlist );
-#ifdef SYS_BEOS
/*
* System specific cleaning code
*/
- beos_Destroy();
+#if defined( SYS_BEOS ) || defined( SYS_DARWIN1_3 )
+ system_Destroy();
#endif
/*
/* 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 )
-{
- /*
- * All features are activated by default except vlans
- */
- p_main->b_audio = 1;
- p_main->b_video = 1;
- p_main->b_vlans = 0;
-}
-
/*****************************************************************************
* GetConfiguration: parse command line
*****************************************************************************
* 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[] )
+static int GetConfiguration( int *pi_argc, char *ppsz_argv[], char *ppsz_env[] )
{
- int c;
- char * p_pointer;
+ int i_cmd;
+ char *p_tmp;
/* Set default configuration and copy arguments */
- p_main->i_argc = i_argc;
+ p_main->i_argc = *pi_argc;
p_main->ppsz_argv = ppsz_argv;
p_main->ppsz_env = ppsz_env;
- SetDefaultConfiguration();
+
+ p_main->b_audio = 1;
+ p_main->b_video = 1;
+ p_main->b_channels = 0;
+
+ p_main->i_warning_level = 4;
/* Get the executable name (similar to the basename command) */
- p_main->psz_arg0 = p_pointer = ppsz_argv[ 0 ];
- while( *p_pointer )
+ p_main->psz_arg0 = p_tmp = ppsz_argv[ 0 ];
+ while( *p_tmp )
{
- if( *p_pointer == '/' )
+ if( *p_tmp == '/' )
{
- p_main->psz_arg0 = ++p_pointer;
+ p_main->psz_arg0 = ++p_tmp;
}
else
{
- ++p_pointer;
+ ++p_tmp;
}
}
+#ifdef SYS_DARWIN1_3
+ /* 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 ( (*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...
+ * hence the following kludge otherwise we'll get confused w/ argv[1]
+ * being an input file name */
+#if 0
+ ppsz_argv[ 1 ] = NULL;
+#endif
+ *pi_argc = *pi_argc - 1;
+ pi_argc--;
+ return( 0 );
+ }
+#endif
+
/* Parse command line options */
-#ifdef HAVE_GETOPT_H
opterr = 0;
- while( ( c = getopt_long( i_argc, ppsz_argv, psz_shortopts, longopts, 0 ) ) != EOF )
+ while( ( i_cmd = getopt_long( *pi_argc, ppsz_argv,
+ psz_shortopts, longopts, 0 ) ) != EOF )
{
- switch( c )
+ switch( i_cmd )
{
/* General/common options */
case 'h': /* -h, --help */
Usage( LONG_HELP );
return( -1 );
break;
- case 'v': /* -v, --version */
+ case OPT_VERSION: /* --version */
Version();
return( -1 );
break;
+ case 'v': /* -v, --verbose */
+ p_main->i_warning_level--;
+ break;
/* Interface warning messages level */
- case 'I': /* -I, --intf */
+ case 'I': /* -I, --intf */
main_PutPszVariable( INTF_METHOD_VAR, optarg );
break;
case OPT_WARNING: /* --warning */
- main_PutIntVariable( INTF_WARNING_VAR, atoi(optarg) );
+ intf_ErrMsg( "intf error: `--warning' is deprecated, use `-v'" );
+ p_main->i_warning_level = atoi(optarg);
break;
/* Audio options */
case OPT_MONO: /* --mono */
main_PutIntVariable( AOUT_STEREO_VAR, 0 );
break;
+ case OPT_SPDIF: /* --spdif */
+ main_PutIntVariable( AOUT_SPDIF_VAR, 1 );
+ 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 );
case OPT_INPUT: /* --input */
main_PutPszVariable( INPUT_METHOD_VAR, optarg );
break;
- case OPT_VLANS: /* --vlans */
- p_main->b_vlans = 1;
+ case OPT_CHANNELS: /* --channels */
+ p_main->b_channels = 1;
break;
case OPT_SERVER: /* --server */
main_PutPszVariable( INPUT_SERVER_VAR, optarg );
main_PutPszVariable( INPUT_PORT_VAR, optarg );
break;
case OPT_BROADCAST: /* --broadcast */
- main_PutIntVariable( INPUT_BROADCAST_VAR, 1 );
+ main_PutPszVariable( INPUT_BROADCAST_VAR, optarg );
break;
/* Synchro options */
/* Internal error: unknown option */
case '?':
default:
- intf_ErrMsg( "intf error: unknown option `%s'", ppsz_argv[optind - 1] );
+ intf_ErrMsg( "intf error: unknown option `%s'",
+ ppsz_argv[optind - 1] );
Usage( USAGE );
return( EINVAL );
break;
}
}
-#endif
+
+ if( p_main->i_warning_level < 0 )
+ {
+ p_main->i_warning_level = 0;
+ }
+
return( 0 );
}
/* Options */
intf_MsgImm( "\nOptions:"
"\n -I, --intf <module> \tinterface method"
- "\n --warning <level> \tdisplay warning messages"
+ "\n -v, --verbose \tverbose mode (cumulative)"
"\n"
"\n --noaudio \tdisable audio"
"\n -A, --aout <module> \taudio output method"
"\n --stereo, --mono \tstereo/mono audio"
+ "\n --spdif \tAC3 pass-through mode"
"\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 --vlans \tenable vlans"
+ "\n --channels \tenable channels"
"\n --server <host> \tvideo server address"
"\n --port <port> \tvideo server port"
"\n --broadcast \tlisten to a broadcast"
"\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 --version \toutput version information and exit" );
if( i_fashion == SHORT_HELP )
return;
intf_MsgImm( "\nInterface parameters:"
"\n " INTF_METHOD_VAR "=<method name> \tinterface method"
"\n " INTF_INIT_SCRIPT_VAR "=<filename> \tinitialization script"
- "\n " INTF_CHANNELS_VAR "=<filename> \tchannels list"
- "\n " INTF_WARNING_VAR "=<level> \twarning level" );
+ "\n " INTF_CHANNELS_VAR "=<filename> \tchannels list" );
/* Audio parameters */
intf_MsgImm( "\nAudio 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_SPDIF_VAR "={1|0} \tAC3 pass-through mode"
"\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" );
"\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 " INPUT_BROADCAST_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 );
| CPU_CAPABILITY_MMX;
#elif defined( SYS_DARWIN1_3 )
- OSErr err;
- long l_attributes = 0;
- err = Gestalt( gestaltPowerPCProcessorFeatures, &l_attributes );
+ struct host_basic_info hi;
+ kern_return_t ret;
+ host_name_port_t host;
+
+ int i_size;
+ char *psz_name, *psz_subname;
+
+ /* Should 'never' fail? */
+ host = mach_host_self();
+
+ i_size = sizeof( hi ) / sizeof( int );
+ ret = host_info( host, HOST_BASIC_INFO, ( host_info_t )&hi, &i_size );
+
+ if( ret != KERN_SUCCESS )
+ {
+ intf_ErrMsg( "error: couldn't get CPU information" );
+ return( i_capabilities );
+ }
- if( err == noErr &&
- ( (1 << gestaltPowerPCHasVectorInstructions) & l_attributes ) )
+ slot_name( hi.cpu_type, hi.cpu_subtype, &psz_name, &psz_subname );
+ /* FIXME: need better way to detect newer proccessors.
+ * could do strncmp(a,b,5), but that's real ugly */
+ if( strcmp(psz_name, "ppc7400") || strcmp(psz_name, "ppc7450") )
{
i_capabilities |= CPU_CAPABILITY_ALTIVEC;
}
: "cc" ); \
/* test for a 486 CPU */
- asm volatile ( "pushfl
- popl %%eax
- movl %%eax, %%ebx
- xorl $0x200000, %%eax
- pushl %%eax
- popfl
- pushfl
- popl %%eax"
+ asm volatile ( "pushfl\n\t"
+ "popl %%eax\n\t"
+ "movl %%eax, %%ebx\n\t"
+ "xorl $0x200000, %%eax\n\t"
+ "pushl %%eax\n\t"
+ "popfl\n\t"
+ "pushfl\n\t"
+ "popl %%eax"
: "=a" ( i_eax ),
"=b" ( i_ebx )
:
projects / vlc / blobdiff