#include "threads.h"
#include "mtime.h"
#include "tests.h" /* TestCPU() */
-#include "plugins.h"
#include "modules.h"
+
#include "stream_control.h"
#include "input_ext-intf.h"
#include "intf_msg.h"
-#include "intf_plst.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
#define OPT_PORT 172
#define OPT_BROADCAST 173
-#define OPT_AOUT 180
-#define OPT_VOUT 181
-#define OPT_MOTION 182
-#define OPT_IDCT 183
-#define OPT_YUV 184
-#define OPT_INPUT 185
+#define OPT_INPUT 180
+#define OPT_MOTION 181
+#define OPT_IDCT 182
+#define OPT_YUV 183
#define OPT_SYNCHRO 190
#define OPT_WARNING 191
{ "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 },
{ "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' },
/* 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 );
#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" );
+ 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( ! TestCPU( CPU_CAPABILITY_MMX ) )
{
- fprintf( stderr, "Sorry, this program needs MMX extensions.\n"
- "Please try a version without MMX support.\n" );
+ fprintf( stderr, "error: this program needs MMX extensions,\n"
+ "please try a version without MMX support\n" );
return( 1 );
}
#endif
intf_MsgImm( COPYRIGHT_MESSAGE );
/*
- * Initialize playlist and get commandline files
+ * Read configuration
*/
- p_main->p_playlist = intf_PlstCreate( );
- if( !p_main->p_playlist )
+ if( GetConfiguration( i_argc, ppsz_argv, ppsz_env ) ) /* parse cmd line */
{
- intf_ErrMsg( "playlist error: playlist initialization failed" );
intf_MsgDestroy();
return( errno );
}
- intf_PlstInit( p_main->p_playlist );
+
+ p_main->i_warning_level = main_GetIntVariable( INTF_WARNING_VAR,
+ INTF_WARNING_DEFAULT );
/*
- * Read configuration
+ * Initialize playlist and get commandline files
*/
- if( GetConfiguration( i_argc, ppsz_argv, ppsz_env ) ) /* parse cmd line */
+ p_main->p_playlist = intf_PlaylistCreate( );
+ if( !p_main->p_playlist )
{
+ intf_ErrMsg( "playlist error: playlist initialization failed" );
intf_MsgDestroy();
return( errno );
}
+ intf_PlaylistInit( p_main->p_playlist );
/*
- * Initialize plugin bank
+ * Get input filenames given as commandline arguments
*/
- p_main->p_bank = bank_Create( );
- if( !p_main->p_bank )
- {
- intf_ErrMsg( "plugin error: plugin bank initialization failed" );
- intf_PlstDestroy( p_main->p_playlist );
- intf_MsgDestroy();
- return( errno );
- }
- bank_Init( p_main->p_bank );
+ GetFilenames( i_argc, ppsz_argv );
/*
* Initialize module bank
*/
- p_main->p_module_bank = module_CreateBank( );
- if( !p_main->p_module_bank )
+ p_main->p_bank = module_CreateBank( );
+ if( !p_main->p_bank )
{
intf_ErrMsg( "module error: module bank initialization failed" );
- bank_Destroy( p_main->p_bank );
- intf_PlstDestroy( p_main->p_playlist );
+ intf_PlaylistDestroy( p_main->p_playlist );
intf_MsgDestroy();
return( errno );
}
- module_InitBank( p_main->p_module_bank );
+ module_InitBank( p_main->p_bank );
/*
* Initialize shared resources and libraries
* 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();
- if( p_main->p_intf != NULL )
+ /*
+ * Open audio device and start aout thread
+ */
+ if( p_main->b_audio )
{
- /*
- * 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 )
{
- 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;
- }
+ /* 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 )
+ /*
+ * 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 )
{
- aout_DestroyThread( p_main->p_aout, 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 );
+
+ 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 );
+ }
+
/*
* Free shared resources and libraries
*/
/*
* Free module bank
*/
- module_DestroyBank( p_main->p_module_bank );
-
- /*
- * Free plugin bank
- */
- bank_Destroy( p_main->p_bank );
+ module_DestroyBank( p_main->p_bank );
/*
* Free playlist
*/
- intf_PlstDestroy( p_main->p_playlist );
+ intf_PlaylistDestroy( p_main->p_playlist );
#ifdef SYS_BEOS
/*
/*
* Terminate messages interface and program
*/
- intf_Msg( "intf: program terminated." );
+ intf_Msg( "intf: program terminated" );
intf_MsgDestroy();
return( 0 );
*****************************************************************************/
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 */
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_COLOR: /* --color */
main_PutIntVariable( VOUT_GRAYSCALE_VAR, 0 );
break;
- case OPT_FULLSCREEN: /* --fullscreen */
+ case OPT_FULLSCREEN: /* --fullscreen */
main_PutIntVariable( VOUT_FULLSCREEN_VAR, 1 );
break;
- case OPT_OVERLAY: /* --overlay */
+ case OPT_OVERLAY: /* --overlay */
main_PutIntVariable( VOUT_OVERLAY_VAR, 1 );
break;
- case OPT_MOTION: /* --motion */
+ case OPT_MOTION: /* --motion */
main_PutPszVariable( MOTION_METHOD_VAR, optarg );
break;
- case OPT_IDCT: /* --idct */
+ case OPT_IDCT: /* --idct */
main_PutPszVariable( IDCT_METHOD_VAR, optarg );
break;
case OPT_YUV: /* --yuv */
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 );
+ main_PutIntVariable( INPUT_AUDIO_VAR, REQUESTED_LPCM );
else if ( ! strcmp(optarg, "mpeg") )
- main_PutIntVariable( INPUT_DVD_AUDIO_VAR, REQUESTED_MPEG );
+ main_PutIntVariable( INPUT_AUDIO_VAR, REQUESTED_MPEG );
else
- main_PutIntVariable( INPUT_DVD_AUDIO_VAR, REQUESTED_NOAUDIO );
+ 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 */
+ case OPT_INPUT: /* --input */
main_PutPszVariable( INPUT_METHOD_VAR, optarg );
break;
case OPT_VLANS: /* --vlans */
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 '?':
}
}
#endif
+ return( 0 );
+}
+
+/*****************************************************************************
+ * 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++ )
{
- intf_PlstAdd( p_main->p_playlist, PLAYLIST_END, ppsz_argv[ i_opt ] );
+ intf_PlaylistAdd( p_main->p_playlist, PLAYLIST_END,
+ ppsz_argv[ i_opt ] );
}
return( 0 );
/* Options */
intf_MsgImm( "\nOptions:"
+ "\n -I, --intf <module> \tinterface method"
+ "\n --warning <level> \tdisplay warning messages"
+ "\n"
"\n --noaudio \tdisable audio"
- "\n --aout <module> \taudio output method"
+ "\n -A, --aout <module> \taudio output method"
"\n --stereo, --mono \tstereo/mono audio"
"\n"
"\n --novideo \tdisable video"
- "\n --vout <module> \tvideo output method"
+ "\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 --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 --port <port> \tvideo server port"
"\n --broadcast \tlisten to a broadcast"
"\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" );
return;
/* Interface parameters */
- intf_MsgImm( "\nInterface parameters:\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" );
/* DVD parameters */
intf_MsgImm( "\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" );
+ "\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_MsgImm( "\nInput parameters:\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"
static void SimpleSignalHandler( int i_signal )
{
/* Acknowledge the signal received */
- intf_WarnMsg(0, "intf: ignoring signal %d", 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 error: signal %d received, exiting", 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