X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fvlc.c;h=622d8052214edacdec21d34c191e286c9fb255ae;hb=2130ab440846b5c52861ff4614526688cf4d99b7;hp=5adc5fe8772e6b37d1059734be22d5a972097220;hpb=7689bc9224e3d9516c56126980cb68eadca6fcaf;p=vlc diff --git a/src/vlc.c b/src/vlc.c index 5adc5fe877..622d805221 100644 --- a/src/vlc.c +++ b/src/vlc.c @@ -2,11 +2,12 @@ * vlc.c: the vlc player ***************************************************************************** * Copyright (C) 1998-2001 VideoLAN - * $Id: vlc.c,v 1.8 2002/08/08 00:35:11 sam Exp $ + * $Id: vlc.c,v 1.19 2002/12/25 23:39:01 sam Exp $ * * Authors: Vincent Seguin * Samuel Hocevar * Gildas Bazin + * Lots of other people, see the libvlc AUTHORS file * * 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 @@ -22,20 +23,37 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. *****************************************************************************/ -#include /* SIGHUP, SIGINT, SIGKILL */ + +#include "config.h" + #include /* fprintf() */ #include /* putenv(), strtol(), */ +#ifdef HAVE_SIGNAL_H +# include /* SIGHUP, SIGINT, SIGKILL */ +#endif +#ifdef HAVE_TIME_H +# include /* time() */ +#endif #include +/***************************************************************************** + * Local prototypes. + *****************************************************************************/ +#ifndef WIN32 +static void SigHandler ( int i_signal ); +#endif + /***************************************************************************** * main: parse command line, start interface and spawn threads *****************************************************************************/ -int main(int i_argc, char *ppsz_argv[]) +int main( int i_argc, char *ppsz_argv[] ) { - vlc_error_t err; + int i_ret; -#ifdef SYS_LINUX + fprintf( stderr, "VideoLAN Client %s\n", VLC_Version() ); + +#ifdef HAVE_PUTENV # ifdef DEBUG /* Activate malloc checking routines to detect heap corruptions. */ putenv( "MALLOC_CHECK_=2" ); @@ -43,49 +61,98 @@ int main(int i_argc, char *ppsz_argv[]) /* Disable the ugly Gnome crash dialog so that we properly segfault */ putenv( "GNOME_DISABLE_CRASH_DIALOG=1" ); # endif -#endif - /* Create the vlc structure */ - err = vlc_create(); - if( err != VLC_SUCCESS ) + /* If the user isn't using VLC_VERBOSE, set it to 0 by default */ + if( getenv( "VLC_VERBOSE" ) == NULL ) { - return err; + putenv( "VLC_VERBOSE=0" ); } +#endif - /* Initialize vlc */ - err = vlc_init( i_argc, ppsz_argv ); - if( err != VLC_SUCCESS ) + /* Create a libvlc structure */ + i_ret = VLC_Create(); + if( i_ret < 0 ) { - vlc_destroy(); - return err; + return i_ret; } - /* Run vlc, in non-blocking mode */ - err = vlc_run(); - - /* Add background interfaces */ -#if 0 - { int i; for( i=10; i--; ) vlc_add_intf( NULL, "dummy", 0 ); } - vlc_add_intf( NULL, "dummy", VLC_FALSE ); - vlc_add_intf( NULL, "logger", VLC_FALSE ); - vlc_add_intf( NULL, "xosd", VLC_FALSE ); - vlc_add_intf( NULL, "gtk", VLC_FALSE ); - vlc_add_intf( NULL, "kde", VLC_FALSE ); - vlc_add_intf( "rc", VLC_FALSE ); +#ifndef WIN32 + /* Set the signal handlers. SIGTERM is not intercepted, because we need at + * least one method to kill the program when all other methods failed, and + * when we don't want to use SIGKILL. + * Note that we set the signals after the vlc_create call. */ + signal( SIGINT, SigHandler ); + signal( SIGHUP, SigHandler ); + signal( SIGQUIT, SigHandler ); + + /* Other signals */ + signal( SIGALRM, SIG_IGN ); + signal( SIGPIPE, SIG_IGN ); #endif + /* Initialize libvlc */ + i_ret = VLC_Init( 0, i_argc, ppsz_argv ); + if( i_ret < 0 ) + { + VLC_Destroy( 0 ); + return i_ret; + } + + /* Run libvlc, in non-blocking mode */ + i_ret = VLC_Play( 0 ); + /* Add a blocking interface and keep the return value */ - err = vlc_add_intf( NULL, VLC_TRUE ); + i_ret = VLC_AddIntf( 0, NULL, VLC_TRUE ); - /* Finish the interface */ - vlc_stop(); + /* Finish the threads */ + VLC_Stop( 0 ); - /* Finish all threads */ - vlc_end(); + /* Destroy the libvlc structure */ + VLC_Destroy( 0 ); - /* Destroy the vlc structure */ - vlc_destroy(); + return i_ret; +} + +#ifndef WIN32 +/***************************************************************************** + * SigHandler: system signal handler + ***************************************************************************** + * 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 SigHandler( int i_signal ) +{ + static time_t abort_time = 0; + static volatile vlc_bool_t b_die = VLC_FALSE; + + /* Once a signal has been trapped, the termination sequence will be + * armed and subsequent signals will be ignored to avoid sending signals + * to a libvlc structure having been destroyed */ + + if( !b_die ) + { + b_die = VLC_TRUE; + abort_time = time( NULL ); + + fprintf( stderr, "signal %d received, terminating vlc - do it " + "again in case it gets stuck\n", i_signal ); + + /* Acknowledge the signal received */ + VLC_Die( 0 ); + } + else if( time( NULL ) > abort_time + 2 ) + { + /* If user asks again 1 or 2 seconds later, die badly */ + signal( SIGINT, SIG_DFL ); + signal( SIGHUP, SIG_DFL ); + signal( SIGQUIT, SIG_DFL ); + signal( SIGALRM, SIG_DFL ); + signal( SIGPIPE, SIG_DFL ); + + fprintf( stderr, "user insisted too much, dying badly\n" ); - return err; + abort(); + } } +#endif