#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 "config.h"
#include "common.h"
+#include "debug.h"
#include "threads.h"
#include "mtime.h"
-#include "tests.h" /* TestMMX() */
+#include "tests.h" /* TestCPU() */
#include "plugins.h"
+#include "modules.h"
#include "playlist.h"
-#include "input_vlan.h"
-#include "input_ps.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_MOTION 167
+#define OPT_IDCT 168
+#define OPT_YUV 169
-#define OPT_NOVLANS 170
+#define OPT_VLANS 170
#define OPT_SERVER 171
#define OPT_PORT 172
+#define OPT_BROADCAST 173
+#define OPT_DVD 174
#define OPT_SYNCHRO 180
+#define OPT_WARNING 190
+
/* Usage fashion */
#define USAGE 0
#define SHORT_HELP 1
#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 },
+ { "motion", 1, 0, OPT_MOTION },
+ { "idct", 1, 0, OPT_IDCT },
{ "yuv", 1, 0, OPT_YUV },
/* DVD options */
{ "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 },
+ { "dvd", 0, 0, OPT_DVD },
/* 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
static void Version ( void );
static void InitSignalHandler ( void );
-static void SignalHandler ( int i_signal );
-#ifdef HAVE_MMX
- int TestMMX ( void );
-#endif
+static void SimpleSignalHandler ( int i_signal );
+static void FatalSignalHandler ( int i_signal );
/*****************************************************************************
* main: parse command line, start interface and spawn threads
beos_Create();
#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 ) )
+ {
+ fprintf( stderr, "Sorry, this program needs a Pentium CPU.\n"
+ "Please try a version without Pentium support.\n" );
+ return( 1 );
+ }
+#endif
+
#ifdef HAVE_MMX
- if( !TestMMX() )
+ if( ! TestCPU( CPU_CAPABILITY_MMX ) )
{
- fprintf( stderr, "Sorry, this program needs an MMX processor. "
- "Please run the non-MMX version.\n" );
+ fprintf( stderr, "Sorry, this program needs MMX extensions.\n"
+ "Please try a version without MMX support.\n" );
return( 1 );
}
#endif
if( !p_main->p_msg ) /* start messages interface */
{
fprintf( stderr, "error: can't initialize messages interface (%s)\n",
- strerror(errno) );
+ strerror(errno) );
return( errno );
}
p_main->p_playlist = playlist_Create( );
if( !p_main->p_playlist )
{
- intf_Msg( "Playlist initialization failed\n" );
+ intf_ErrMsg( "playlist error: playlist initialization failed" );
intf_MsgDestroy();
return( errno );
}
p_main->p_bank = bank_Create( );
if( !p_main->p_bank )
{
- intf_Msg( "Plugin bank initialization failed\n" );
+ intf_ErrMsg( "plugin error: plugin bank initialization failed" );
playlist_Destroy( p_main->p_playlist );
intf_MsgDestroy();
return( errno );
bank_Init( p_main->p_bank );
/*
- * Initialize shared resources and libraries
+ * Initialize module bank
*/
- if( p_main->b_vlans && input_VlanCreate() )
+ p_main->p_module_bank = module_CreateBank( );
+ if( !p_main->p_module_bank )
{
- /* On error during vlans initialization, switch off vlans */
- intf_Msg( "Virtual LANs initialization failed : "
- "vlans management is deactivated\n" );
- p_main->b_vlans = 0;
+ intf_ErrMsg( "module error: module bank initialization failed" );
+ bank_Destroy( p_main->p_bank );
+ playlist_Destroy( p_main->p_playlist );
+ intf_MsgDestroy();
+ return( errno );
}
+ module_InitBank( p_main->p_module_bank );
/*
- * Open audio device and start aout thread
+ * Initialize shared resources and libraries
*/
- if( p_main->b_audio )
+ /* FIXME: no VLANs */
+#if 0
+ if( p_main->b_vlans && input_VlanCreate() )
{
- p_main->p_aout = aout_CreateThread( NULL );
- if( p_main->p_aout == NULL )
- {
- /* On error during audio initialization, switch off audio */
- intf_Msg( "Audio initialization failed : audio is deactivated\n" );
- p_main->b_audio = 0;
- }
+ /* On error during vlans initialization, switch off vlans */
+ intf_Msg( "Virtual LANs initialization failed : "
+ "vlans management is deactivated" );
+ p_main->b_vlans = 0;
}
+#endif
/*
* Run interface
*/
p_main->p_intf = intf_Create();
+
if( p_main->p_intf != NULL )
{
- InitSignalHandler(); /* prepare signals for interception */
+ /*
+ * 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;
+ }
+ }
/*
* This is the main loop
intf_Run( p_main->p_intf );
intf_Destroy( p_main->p_intf );
- }
- /*
- * Close audio device
- */
- if( p_main->b_audio )
- {
- aout_DestroyThread( p_main->p_aout, NULL );
+ /*
+ * Close audio device
+ */
+ if( p_main->b_audio )
+ {
+ aout_DestroyThread( p_main->p_aout, NULL );
+ }
}
/*
* Free shared resources and libraries
*/
+ /* FIXME */
+#if 0
if( p_main->b_vlans )
{
input_VlanDestroy();
}
+#endif
+
+ /*
+ * Free module bank
+ */
+ module_DestroyBank( p_main->p_module_bank );
/*
* Free plugin bank
/*
* Terminate messages interface and program
*/
- intf_Msg( "Program terminated.\n" );
+ intf_Msg( "intf: program terminated." );
intf_MsgDestroy();
return( 0 );
psz_env = malloc( strlen(psz_name) + strlen(psz_value) + 2 );
if( psz_env == NULL )
{
- intf_ErrMsg( "error: %s\n", strerror(ENOMEM) );
+ intf_ErrMsg( "intf error: cannot create psz_env (%s)",
+ strerror(ENOMEM) );
}
else
{
sprintf( psz_env, "%s=%s", psz_name, psz_value );
if( putenv( psz_env ) )
{
- intf_ErrMsg( "error: %s\n", strerror(errno) );
+ intf_ErrMsg( "intf error: cannot putenv (%s)", strerror(errno) );
}
}
}
static void SetDefaultConfiguration( void )
{
/*
- * All features are activated by default
+ * All features are activated by default except vlans
*/
p_main->b_audio = 1;
p_main->b_video = 1;
- p_main->b_vlans = 1;
+ p_main->b_vlans = 0;
+ p_main->b_dvd = 0;
}
/*****************************************************************************
p_main->ppsz_env = ppsz_env;
SetDefaultConfiguration();
- intf_MsgImm( COPYRIGHT_MESSAGE "\n" );
+ intf_MsgImm( COPYRIGHT_MESSAGE );
/* Get the executable name (similar to the basename command) */
p_main->psz_arg0 = p_pointer = ppsz_argv[ 0 ];
}
/* 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_MOTION: /* --motion */
+ main_PutPszVariable( MOTION_METHOD_VAR, optarg );
+ break;
+ case OPT_IDCT: /* --idct */
+ main_PutPszVariable( IDCT_METHOD_VAR, optarg );
+ break;
case OPT_YUV: /* --yuv */
main_PutPszVariable( YUV_METHOD_VAR, optarg );
break;
/* DVD options */
case 'a':
- if ( ! strcmp(optarg, "mpeg") )
- main_PutIntVariable( INPUT_DVD_AUDIO_VAR, REQUESTED_MPEG );
+ if ( ! strcmp(optarg, "ac3") )
+ main_PutIntVariable( INPUT_DVD_AUDIO_VAR, REQUESTED_AC3 );
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 );
+ main_PutIntVariable( INPUT_DVD_AUDIO_VAR, REQUESTED_MPEG );
break;
case 'c':
main_PutIntVariable( INPUT_DVD_CHANNEL_VAR, atoi(optarg) );
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;
+ case OPT_DVD: /* --dvd */
+ p_main->b_dvd = 1;
+ break;
/* Synchro options */
- case OPT_SYNCHRO:
+ 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:
- intf_ErrMsg( "intf error: unknown option `%s'\n", ppsz_argv[optind - 1] );
+ intf_ErrMsg( "intf error: unknown option `%s'", ppsz_argv[optind - 1] );
Usage( USAGE );
return( EINVAL );
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: %s [options] [parameters] [file]...\n",
+ intf_Msg( "Usage: %s [options] [parameters] [file]...",
p_main->psz_arg0 );
if( i_fashion == USAGE )
{
- intf_Msg( "Try `%s --help' for more information.\n",
+ intf_Msg( "Try `%s --help' for more information.",
p_main->psz_arg0 );
return;
}
/* Options */
- intf_Msg( "\n"
- "Options:\n"
- " --noaudio \tdisable audio\n"
- " --aout <plugin> \taudio output method\n"
- " --stereo, --mono \tstereo/mono audio\n"
+ intf_Msg( "\nOptions:"
+ "\n --noaudio \tdisable audio"
+ "\n --aout <module> \taudio output method"
+ "\n --stereo, --mono \tstereo/mono audio"
"\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 --novideo \tdisable video"
+ "\n --vout <module> \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 --motion <module> \tmotion compensation method"
+ "\n --idct <module> \tIDCT method"
+ "\n --yuv <module> \tYUV method"
+ "\n --synchro <type> \tforce synchro algorithm"
"\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 --dvd \tDVD mode"
+ "\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"
- " --novlans \tdisable vlans\n"
- " --server <host> \tvideo server address\n"
- " --port <port> \tvideo server port\n"
+ "\n --vlans \tenable vlans"
+ "\n --server <host> \tvideo server address"
+ "\n --port <port> \tvideo server port"
+ "\n --broadcast \tlisten to a broadcast"
"\n"
- " --synchro <type> \tforce synchro algorithm\n"
+ "\n --warning <level> \tdisplay warning messages"
"\n"
- " -h, --help \tprint help and exit\n"
- " -H, --longhelp \tprint long help and exit\n"
- " -v, --version \toutput version information and exit\n" );
+ "\n -h, --help \tprint help and exit"
+ "\n -H, --longhelp \tprint long help and exit"
+ "\n -v, --version \toutput version information and exit" );
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" );
+ intf_Msg( "\nInterface parameters:\n"
+ "\n " INTF_INIT_SCRIPT_VAR "=<filename> \tinitialization script"
+ "\n " INTF_CHANNELS_VAR "=<filename> \tchannels list"
+ "\n " INTF_WARNING_VAR "=<level> \twarning level" );
/* 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" );
+ intf_Msg( "\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_RATE_VAR "=<rate> \toutput rate" );
/* 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" );
+ intf_Msg( "\nVideo 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 " MOTION_METHOD_VAR "=<method name> \tmotion compensation method"
+ "\n " IDCT_METHOD_VAR "=<method name> \tIDCT method"
+ "\n " YUV_METHOD_VAR "=<method name> \tYUV method"
+ "\n " VPAR_SYNCHRO_VAR "={I|I+|IP|IP+|IPB} \tsynchro algorithm" );
/* 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" );
+ intf_Msg( "\nDVD parameters:"
+ "\n " INPUT_DVD_DEVICE_VAR "=<device> \tDVD device"
+ "\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" );
/* 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" );
-
- /* Synchro parameters */
- intf_Msg( "\n"
- "Synchro parameters:\n"
- " " VPAR_SYNCHRO_VAR "={I|I+|IP|IP+|IPB} \tsynchro algorithm\n");
+ intf_Msg( "\nInput parameters:\n"
+ "\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"
+ );
+
}
/*****************************************************************************
"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" );
+ "Written by the VideoLAN team at Ecole Centrale, Paris." );
}
static void InitSignalHandler( void )
{
/* Termination signals */
- signal( SIGHUP, SignalHandler );
- signal( SIGINT, SignalHandler );
- signal( SIGQUIT, SignalHandler );
+ signal( SIGHUP, FatalSignalHandler );
+ signal( SIGINT, FatalSignalHandler );
+ signal( SIGQUIT, FatalSignalHandler );
+
+ /* Other signals */
+ signal( SIGALRM, SimpleSignalHandler );
+ signal( SIGPIPE, SimpleSignalHandler );
}
+
+/*****************************************************************************
+ * SimpleSignalHandler: system signal handler
+ *****************************************************************************
+ * This function is called when a non fatal signal is received by the program.
+ *****************************************************************************/
+static void SimpleSignalHandler( int i_signal )
+{
+ /* Acknowledge the signal received */
+ intf_WarnMsg(0, "intf: ignoring signal %d", i_signal );
+}
+
+
/*****************************************************************************
- * SignalHandler: system signal handler
+ * FatalSignalHandler: system signal handler
*****************************************************************************
- * This function is called when a signal is received by the program. It tries to
- * end the program in a clean way.
+ * This function is called when a fatal signal is received by the program.
+ * It tries to end the program in a clean way.
*****************************************************************************/
-static void SignalHandler( int i_signal )
+static void FatalSignalHandler( int i_signal )
{
/* 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
signal( SIGQUIT, SIG_IGN );
/* Acknowledge the signal received */
- intf_ErrMsgImm("intf: signal %d received\n", i_signal );
+ intf_ErrMsgImm("intf error: signal %d received, exiting", i_signal );
/* Try to terminate everything - this is done by requesting the end of the
* interface thread */
projects / vlc / blobdiff