X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Finterface%2Fmain.c;h=a067959a67d8c7a5339935cf8d632e83da9baa09;hb=6eb6044c0b7663994ccf1ffde3b32dc4e3a003c7;hp=e368383e364505453150a31c17ed76ce31421542;hpb=b9079557cb5224754886ea04d95df124552fb73d;p=vlc diff --git a/src/interface/main.c b/src/interface/main.c index e368383e36..a067959a67 100644 --- a/src/interface/main.c +++ b/src/interface/main.c @@ -28,22 +28,27 @@ #include "defs.h" #include /* SIGHUP, SIGINT, SIGKILL */ -#include /* getopt() */ #include /* sprintf() */ +#ifdef HAVE_GETOPT_H +#include /* getopt() */ +#endif + #include /* ENOMEM */ #include /* getenv(), strtol(), */ #include /* strerror() */ #include "config.h" +#include "debug.h" #include "common.h" #include "threads.h" #include "mtime.h" #include "tests.h" /* TestMMX() */ #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" @@ -91,6 +96,7 @@ #define LONG_HELP 2 /* Long options */ +#ifdef HAVE_GETOPT_H static const struct option longopts[] = { /* name, has_arg, flag, val */ @@ -137,6 +143,8 @@ static const struct option longopts[] = /* Short options */ static const char *psz_shortopts = "hHvga:s:c:"; +#endif + /***************************************************************************** * Global variable program_data - this is the one and only, see main.h @@ -153,7 +161,8 @@ static void Usage ( int i_fashion ); static void Version ( void ); static void InitSignalHandler ( void ); -static void SignalHandler ( int i_signal ); +static void SimpleSignalHandler ( int i_signal ); +static void FatalSignalHandler ( int i_signal ); #ifdef HAVE_MMX int TestMMX ( void ); #endif @@ -200,10 +209,15 @@ int main( int i_argc, char *ppsz_argv[], char *ppsz_env[] ) 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 */ + /* * Read configuration */ @@ -219,7 +233,7 @@ int main( int i_argc, char *ppsz_argv[], char *ppsz_env[] ) p_main->p_playlist = playlist_Create( ); if( !p_main->p_playlist ) { - intf_Msg( "Playlist initialization failed\n" ); + intf_Msg( "Playlist initialization failed" ); intf_MsgDestroy(); return( errno ); } @@ -231,23 +245,40 @@ int main( int i_argc, char *ppsz_argv[], char *ppsz_env[] ) p_main->p_bank = bank_Create( ); if( !p_main->p_bank ) { - intf_Msg( "Plugin bank initialization failed\n" ); + intf_Msg( "Plugin bank initialization failed" ); playlist_Destroy( p_main->p_playlist ); intf_MsgDestroy(); return( errno ); } bank_Init( p_main->p_bank ); + /* + * Initialize module bank + */ + p_main->p_module_bank = module_CreateBank( ); + if( !p_main->p_module_bank ) + { + intf_Msg( "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 ); + /* * Initialize shared resources and libraries */ + /* FIXME: no VLANs */ +#if 0 if( p_main->b_vlans && input_VlanCreate() ) { /* 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 /* * Open audio device and start aout thread @@ -258,7 +289,7 @@ int main( int i_argc, char *ppsz_argv[], char *ppsz_env[] ) if( p_main->p_aout == NULL ) { /* On error during audio initialization, switch off audio */ - intf_Msg( "Audio initialization failed : audio is deactivated\n" ); + intf_Msg( "Audio initialization failed : audio is deactivated" ); p_main->b_audio = 0; } } @@ -269,8 +300,6 @@ int main( int i_argc, char *ppsz_argv[], char *ppsz_env[] ) p_main->p_intf = intf_Create(); if( p_main->p_intf != NULL ) { - InitSignalHandler(); /* prepare signals for interception */ - /* * This is the main loop */ @@ -290,10 +319,18 @@ int main( int i_argc, char *ppsz_argv[], char *ppsz_env[] ) /* * 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 @@ -315,7 +352,7 @@ int main( int i_argc, char *ppsz_argv[], char *ppsz_env[] ) /* * Terminate messages interface and program */ - intf_Msg( "Program terminated.\n" ); + intf_Msg( "Program terminated." ); intf_MsgDestroy(); return( 0 ); @@ -375,14 +412,15 @@ void main_PutPszVariable( char *psz_name, char *psz_value ) 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) ); } } } @@ -415,7 +453,7 @@ void main_PutIntVariable( char *psz_name, int i_value ) static void SetDefaultConfiguration( void ) { /* - * All features are activated by default execpted vlans + * All features are activated by default except vlans */ p_main->b_audio = 1; p_main->b_video = 1; @@ -442,7 +480,7 @@ static int GetConfiguration( int i_argc, char *ppsz_argv[], char *ppsz_env[] ) 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 ]; @@ -459,6 +497,7 @@ static int GetConfiguration( int i_argc, char *ppsz_argv[], char *ppsz_env[] ) } /* Parse command line options */ +#ifdef HAVE_GETOPT_H opterr = 0; while( ( c = getopt_long( i_argc, ppsz_argv, psz_shortopts, longopts, 0 ) ) != EOF ) { @@ -521,14 +560,14 @@ static int GetConfiguration( int i_argc, char *ppsz_argv[], char *ppsz_env[] ) /* 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) ); @@ -564,12 +603,13 @@ static int GetConfiguration( int i_argc, char *ppsz_argv[], char *ppsz_env[] ) /* 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++ ) @@ -587,96 +627,89 @@ static int GetConfiguration( int i_argc, char *ppsz_argv[], char *ppsz_env[] ) 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 \taudio output method\n" - " --stereo, --mono \tstereo/mono audio\n" + intf_Msg( "\nOptions:" + "\n --noaudio \tdisable audio" + "\n --aout \taudio output method" + "\n --stereo, --mono \tstereo/mono audio" "\n" - " --novideo \tdisable video\n" - " --vout \tvideo output method\n" - " --display \tdisplay string\n" - " --width , --height \tdisplay dimensions\n" - " -g, --grayscale \tgrayscale output\n" - " --color \tcolor output\n" + "\n --novideo \tdisable video" + "\n --vout \tvideo output method" + "\n --display \tdisplay string" + "\n --width , --height \tdisplay dimensions" + "\n -g, --grayscale \tgrayscale output" + "\n --color \tcolor output" "\n" - " -a, --dvdaudio \tchoose DVD audio type\n" - " -c, --dvdchannel \tchoose DVD audio channel\n" - " -s, --dvdsubtitle \tchoose DVD subtitle channel\n" + "\n -a, --dvdaudio \tchoose DVD audio type" + "\n -c, --dvdchannel \tchoose DVD audio channel" + "\n -s, --dvdsubtitle \tchoose DVD subtitle channel" "\n" - " --vlans \tenable vlans\n" - " --server \tvideo server address\n" - " --port \tvideo server port\n" - " --broadcast \tlisten to a broadcast\n" + "\n --vlans \tenable vlans" + "\n --server \tvideo server address" + "\n --port \tvideo server port" + "\n --broadcast \tlisten to a broadcast" "\n" - " --synchro \tforce synchro algorithm\n" + "\n --synchro \tforce synchro algorithm" "\n" - " --warning \tdisplay warning messages\n" + "\n --warning \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 "= \tinitialization script\n" - " " INTF_CHANNELS_VAR "= \tchannels list\n" - " " INTF_WARNING_VAR "= \twarning level\n" ); + intf_Msg( "\nInterface parameters:\n" + "\n " INTF_INIT_SCRIPT_VAR "= \tinitialization script" + "\n " INTF_CHANNELS_VAR "= \tchannels list" + "\n " INTF_WARNING_VAR "= \twarning level" ); /* Audio parameters */ - intf_Msg( "\n" - "Audio parameters:\n" - " " AOUT_METHOD_VAR "= \taudio method\n" - " " AOUT_DSP_VAR "= \tdsp device path\n" - " " AOUT_STEREO_VAR "={1|0} \tstereo or mono output\n" - " " AOUT_RATE_VAR "= \toutput rate\n" ); + intf_Msg( "\nAudio parameters:" + "\n " AOUT_METHOD_VAR "= \taudio method" + "\n " AOUT_DSP_VAR "= \tdsp device path" + "\n " AOUT_STEREO_VAR "={1|0} \tstereo or mono output" + "\n " AOUT_RATE_VAR "= \toutput rate" ); /* Video parameters */ - intf_Msg( "\n" - "Video parameters:\n" - " " VOUT_METHOD_VAR "= \tdisplay method\n" - " " VOUT_DISPLAY_VAR "= \tdisplay used\n" - " " VOUT_WIDTH_VAR "= \tdisplay width\n" - " " VOUT_HEIGHT_VAR "= \tdislay height\n" - " " VOUT_FB_DEV_VAR "= \tframebuffer device path\n" - " " VOUT_GRAYSCALE_VAR "={1|0} \tgrayscale or color output\n" ); + intf_Msg( "\nVideo parameters:" + "\n " VOUT_METHOD_VAR "= \tdisplay method" + "\n " VOUT_DISPLAY_VAR "= \tdisplay used" + "\n " VOUT_WIDTH_VAR "= \tdisplay width" + "\n " VOUT_HEIGHT_VAR "= \tdislay height" + "\n " VOUT_FB_DEV_VAR "= \tframebuffer device path" + "\n " VOUT_GRAYSCALE_VAR "={1|0} \tgrayscale or color output" ); /* 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_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 "= \tvideo server\n" - " " INPUT_PORT_VAR "= \tvideo server port\n" - " " INPUT_IFACE_VAR "= \tnetwork interface\n" - " " INPUT_BROADCAST_VAR "={1|0} \tbroadcast mode\n" - " " INPUT_VLAN_SERVER_VAR "= \tvlan server\n" - " " INPUT_VLAN_PORT_VAR "= \tvlan server port\n" ); + intf_Msg( "\nInput parameters:\n" + "\n " INPUT_SERVER_VAR "= \tvideo server" + "\n " INPUT_PORT_VAR "= \tvideo server port" + "\n " INPUT_IFACE_VAR "= \tnetwork interface" + "\n " INPUT_BROADCAST_VAR "={1|0} \tbroadcast mode" + "\n " INPUT_VLAN_SERVER_VAR "= \tvlan server" + "\n " INPUT_VLAN_PORT_VAR "= \tvlan server port" ); /* Synchro parameters */ - intf_Msg( "\n" - "Synchro parameters:\n" - " " VPAR_SYNCHRO_VAR "={I|I+|IP|IP+|IPB} \tsynchro algorithm\n"); + intf_Msg( "\nSynchro parameters:" + "\n " VPAR_SYNCHRO_VAR "={I|I+|IP|IP+|IPB} \tsynchro algorithm"); } /***************************************************************************** @@ -690,7 +723,7 @@ static void Version( void ) "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." ); } @@ -704,18 +737,35 @@ static void Version( void ) 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 @@ -725,7 +775,7 @@ static void SignalHandler( int i_signal ) 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 */