#include <string.h> /* strerror() */
#include "config.h"
-#include "debug.h"
#include "common.h"
+#include "debug.h"
#include "threads.h"
#include "mtime.h"
-#include "tests.h" /* TestMMX() */
-#include "plugins.h"
-#include "playlist.h"
+#include "tests.h" /* TestCPU() */
+#include "modules.h"
+
#include "stream_control.h"
#include "input_ext-intf.h"
#include "intf_msg.h"
+#include "intf_playlist.h"
#include "interface.h"
#include "audio_output.h"
+#include "video.h"
+#include "video_output.h"
+
#ifdef SYS_BEOS
#include "beos_specific.h"
#endif
/* Long options return values - note that values corresponding to short options
* chars, and in general any regular char, should be avoided */
#define OPT_NOAUDIO 150
-#define OPT_AOUT 151
-#define OPT_STEREO 152
-#define OPT_MONO 153
+#define OPT_STEREO 151
+#define OPT_MONO 152
#define OPT_NOVIDEO 160
-#define OPT_VOUT 161
-#define OPT_DISPLAY 162
-#define OPT_WIDTH 163
-#define OPT_HEIGHT 164
-#define OPT_COLOR 165
-#define OPT_YUV 166
+#define OPT_DISPLAY 161
+#define OPT_WIDTH 162
+#define OPT_HEIGHT 163
+#define OPT_COLOR 164
+#define OPT_FULLSCREEN 165
+#define OPT_OVERLAY 166
#define OPT_VLANS 170
#define OPT_SERVER 171
#define OPT_PORT 172
#define OPT_BROADCAST 173
-#define OPT_SYNCHRO 180
+#define OPT_INPUT 180
+#define OPT_MOTION 181
+#define OPT_IDCT 182
+#define OPT_YUV 183
-#define OPT_WARNING 190
+#define OPT_SYNCHRO 190
+#define OPT_WARNING 191
/* Usage fashion */
#define USAGE 0
{ "longhelp", 0, 0, 'H' },
{ "version", 0, 0, 'v' },
+ /* Interface options */
+ { "intf", 1, 0, 'I' },
+ { "warning", 1, 0, OPT_WARNING },
+
/* Audio options */
{ "noaudio", 0, 0, OPT_NOAUDIO },
- { "aout", 1, 0, OPT_AOUT },
+ { "aout", 1, 0, 'A' },
{ "stereo", 0, 0, OPT_STEREO },
{ "mono", 0, 0, OPT_MONO },
/* Video options */
{ "novideo", 0, 0, OPT_NOVIDEO },
- { "vout", 1, 0, OPT_VOUT },
+ { "vout", 1, 0, 'V' },
{ "display", 1, 0, OPT_DISPLAY },
{ "width", 1, 0, OPT_WIDTH },
{ "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 },
+ { "fullscreen", 0, 0, OPT_FULLSCREEN },
+ { "overlay", 0, 0, OPT_OVERLAY },
/* DVD options */
+ { "dvdtitle", 1, 0, 't' },
+ { "dvdchapter", 1, 0, 'T' },
{ "dvdaudio", 1, 0, 'a' },
{ "dvdchannel", 1, 0, 'c' },
{ "dvdsubtitle", 1, 0, 's' },
/* Input options */
+ { "input", 1, 0, OPT_INPUT },
{ "vlans", 0, 0, OPT_VLANS },
{ "server", 1, 0, OPT_SERVER },
{ "port", 1, 0, OPT_PORT },
/* 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:";
+static const char *psz_shortopts = "hHvgt:T:a:s:c:I:A:V:";
#endif
static void SetDefaultConfiguration ( void );
static int GetConfiguration ( int i_argc, char *ppsz_argv[],
char *ppsz_env[] );
+static int GetFilenames ( int i_argc, char *ppsz_argv[] );
static void Usage ( int i_fashion );
static void Version ( void );
static void InitSignalHandler ( void );
static void SimpleSignalHandler ( int i_signal );
static void FatalSignalHandler ( int i_signal );
-#ifdef HAVE_MMX
- int TestMMX ( void );
-#endif
/*****************************************************************************
* 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, "error: 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, "error: 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 );
}
- /*
- * Set signal handling policy up for all the threads that will be created
- */
- InitSignalHandler(); /* prepare signals for interception */
+ intf_MsgImm( COPYRIGHT_MESSAGE );
/*
* Read configuration
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 = playlist_Create( );
+ p_main->p_playlist = intf_PlaylistCreate( );
if( !p_main->p_playlist )
{
- intf_Msg( "Playlist initialization failed\n" );
+ intf_ErrMsg( "playlist error: playlist initialization failed" );
intf_MsgDestroy();
return( errno );
}
- playlist_Init( p_main->p_playlist, optind );
+ intf_PlaylistInit( p_main->p_playlist );
+
+ /*
+ * Get input filenames given as commandline arguments
+ */
+ GetFilenames( i_argc, ppsz_argv );
/*
- * Initialize plugin bank
+ * Initialize module bank
*/
- p_main->p_bank = bank_Create( );
+ p_main->p_bank = module_CreateBank( );
if( !p_main->p_bank )
{
- intf_Msg( "Plugin bank initialization failed\n" );
- playlist_Destroy( p_main->p_playlist );
+ intf_ErrMsg( "module error: module bank initialization failed" );
+ intf_PlaylistDestroy( p_main->p_playlist );
intf_MsgDestroy();
return( errno );
}
- bank_Init( p_main->p_bank );
+ module_InitBank( p_main->p_bank );
/*
* Initialize shared resources and libraries
{
/* On error during vlans initialization, switch off vlans */
intf_Msg( "Virtual LANs initialization failed : "
- "vlans management is deactivated\n" );
+ "vlans management is deactivated" );
p_main->b_vlans = 0;
}
#endif
+ /*
+ * Run interface
+ */
+ p_main->p_intf = intf_Create();
+ if( !p_main->p_intf )
+ {
+ 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->p_aout == NULL )
{
/* On error during audio initialization, switch off audio */
- intf_Msg( "Audio initialization failed : audio is deactivated\n" );
+ intf_ErrMsg( "aout error: audio initialization failed,"
+ " audio is deactivated" );
p_main->b_audio = 0;
}
}
/*
- * Run interface
+ * Open video device and start vout thread
*/
- p_main->p_intf = intf_Create();
- if( p_main->p_intf != NULL )
+ if( p_main->b_video )
{
- /*
- * This is the main loop
- */
- intf_Run( p_main->p_intf );
+ 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;
+ }
+ }
- intf_Destroy( p_main->p_intf );
+ /* 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 );
}
/*
#endif
/*
- * Free plugin bank
+ * Free module bank
*/
- bank_Destroy( p_main->p_bank );
+ module_DestroyBank( p_main->p_bank );
/*
* Free playlist
*/
- playlist_Destroy( p_main->p_playlist );
+ intf_PlaylistDestroy( p_main->p_playlist );
#ifdef SYS_BEOS
/*
/*
* 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) );
}
}
}
p_main->b_audio = 1;
p_main->b_video = 1;
p_main->b_vlans = 0;
-
- /* This is |_|lt1m4t3 |<l|_|d63 */
- main_PutIntVariable( INPUT_DVD_SUBTITLE_VAR, -1 );
}
/*****************************************************************************
*****************************************************************************/
static int GetConfiguration( int i_argc, char *ppsz_argv[], char *ppsz_env[] )
{
- int c, i_opt;
+ int c;
char * p_pointer;
/* Set default configuration and copy arguments */
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 )
return( -1 );
break;
+ /* Interface warning messages level */
+ case 'I': /* -I, --intf */
+ main_PutPszVariable( INTF_METHOD_VAR, optarg );
+ break;
+ case OPT_WARNING: /* --warning */
+ main_PutIntVariable( INTF_WARNING_VAR, atoi(optarg) );
+ break;
+
/* Audio options */
case OPT_NOAUDIO: /* --noaudio */
p_main->b_audio = 0;
break;
- case OPT_AOUT: /* --aout */
+ case 'A': /* -A, --aout */
main_PutPszVariable( AOUT_METHOD_VAR, optarg );
break;
case OPT_STEREO: /* --stereo */
case OPT_NOVIDEO: /* --novideo */
p_main->b_video = 0;
break;
- case OPT_VOUT: /* --vout */
+ case 'V': /* -V, --vout */
main_PutPszVariable( VOUT_METHOD_VAR, optarg );
break;
case OPT_DISPLAY: /* --display */
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;
+ case OPT_FULLSCREEN: /* --fullscreen */
+ main_PutIntVariable( VOUT_FULLSCREEN_VAR, 1 );
+ break;
+ case OPT_OVERLAY: /* --overlay */
+ main_PutIntVariable( VOUT_OVERLAY_VAR, 1 );
+ 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 't':
+ main_PutIntVariable( INPUT_TITLE_VAR, atoi(optarg) );
+ break;
+ case 'T':
+ main_PutIntVariable( INPUT_CHAPTER_VAR, atoi(optarg) );
+ break;
case 'a':
if ( ! strcmp(optarg, "ac3") )
- main_PutIntVariable( INPUT_DVD_AUDIO_VAR, REQUESTED_AC3 );
+ main_PutIntVariable( INPUT_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 );
+ main_PutIntVariable( INPUT_AUDIO_VAR, REQUESTED_LPCM );
+ else if ( ! strcmp(optarg, "mpeg") )
+ main_PutIntVariable( INPUT_AUDIO_VAR, REQUESTED_MPEG );
else
- main_PutIntVariable( INPUT_DVD_AUDIO_VAR, REQUESTED_MPEG );
+ main_PutIntVariable( INPUT_AUDIO_VAR, REQUESTED_NOAUDIO );
break;
case 'c':
- main_PutIntVariable( INPUT_DVD_CHANNEL_VAR, atoi(optarg) );
+ main_PutIntVariable( INPUT_CHANNEL_VAR, atoi(optarg) );
break;
case 's':
- main_PutIntVariable( INPUT_DVD_SUBTITLE_VAR, atoi(optarg) );
+ main_PutIntVariable( INPUT_SUBTITLE_VAR, atoi(optarg) );
break;
/* Input options */
+ case OPT_INPUT: /* --input */
+ main_PutPszVariable( INPUT_METHOD_VAR, optarg );
+ break;
case OPT_VLANS: /* --vlans */
p_main->b_vlans = 1;
break;
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
+ return( 0 );
+}
- /* Parse command line parameters - no check is made for these options */
+/*****************************************************************************
+ * GetFilenames: parse command line options which are not flags
+ *****************************************************************************
+ * Parse command line for input files.
+ *****************************************************************************/
+static int GetFilenames( int i_argc, char *ppsz_argv[] )
+{
+ int i_opt;
+
+ /* We assume that the remaining parameters are filenames */
for( i_opt = optind; i_opt < i_argc; i_opt++ )
{
- putenv( ppsz_argv[ i_opt ] );
+ intf_PlaylistAdd( p_main->p_playlist, PLAYLIST_END,
+ ppsz_argv[ i_opt ] );
}
+
return( 0 );
}
static void Usage( int i_fashion )
{
/* Usage */
- intf_Msg( "Usage: %s [options] [parameters] [file]...\n",
- p_main->psz_arg0 );
+ intf_MsgImm( "Usage: %s [options] [parameters] [file]...",
+ p_main->psz_arg0 );
if( i_fashion == USAGE )
{
- intf_Msg( "Try `%s --help' for more information.\n",
- p_main->psz_arg0 );
+ intf_MsgImm( "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"
- "\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 <type> \tchoose DVD audio type\n"
- " -c, --dvdchannel <channel> \tchoose DVD audio channel\n"
- " -s, --dvdsubtitle <channel> \tchoose DVD subtitle channel\n"
- "\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"
- " -v, --version \toutput version information and exit\n" );
+ intf_MsgImm( "\nOptions:"
+ "\n -I, --intf <module> \tinterface method"
+ "\n --warning <level> \tdisplay warning messages"
+ "\n"
+ "\n --noaudio \tdisable audio"
+ "\n -A, --aout <module> \taudio output method"
+ "\n --stereo, --mono \tstereo/mono audio"
+ "\n"
+ "\n --novideo \tdisable video"
+ "\n -V, --vout <module> \tvideo output method"
+ "\n --display <display> \tdisplay string"
+ "\n --width <w>, --height <h> \tdisplay dimensions"
+ "\n -g, --grayscale \tgrayscale output"
+ "\n --fullscreen \tfullscreen output"
+ "\n --overlay \taccelerated display"
+ "\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"
+ "\n -t, --dvdtitle <num> \tchoose DVD title"
+ "\n -T, --dvdchapter <num> \tchoose DVD chapter"
+ "\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 --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" );
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_WARNING_VAR "=<level> \twarning level\n" );
+ 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" );
/* 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_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_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_MsgImm( "\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 " VOUT_FULLSCREEN_VAR "={1|0} \tfullscreen"
+ "\n " VOUT_OVERLAY_VAR "={1|0} \toverlay"
+ "\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_MsgImm( "\nDVD 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_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_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_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");
+ 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_VLAN_SERVER_VAR "=<hostname> \tvlan server"
+ "\n " INPUT_VLAN_PORT_VAR "=<port> \tvlan server port" );
+
}
/*****************************************************************************
*****************************************************************************/
static void Version( void )
{
- 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" );
-
+ intf_MsgImm( 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." );
}
/*****************************************************************************
static void SimpleSignalHandler( int i_signal )
{
/* Acknowledge the signal received */
- intf_WarnMsg(0, "intf: ignoring signal %d\n", i_signal );
+ intf_WarnMsg( 0, "intf: ignoring signal %d", 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
- * having been destroyed */
+ /* 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, exiting\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