X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fvlc.c;h=2f2750ad55f4d6b391a7ed8696e48b346563b6d5;hb=cc960e5b4b61132996563818db285adf02507a62;hp=5adc5fe8772e6b37d1059734be22d5a972097220;hpb=7689bc9224e3d9516c56126980cb68eadca6fcaf;p=vlc diff --git a/src/vlc.c b/src/vlc.c index 5adc5fe877..2f2750ad55 100644 --- a/src/vlc.c +++ b/src/vlc.c @@ -1,12 +1,14 @@ /***************************************************************************** * vlc.c: the vlc player ***************************************************************************** - * Copyright (C) 1998-2001 VideoLAN - * $Id: vlc.c,v 1.8 2002/08/08 00:35:11 sam Exp $ + * Copyright (C) 1998-2004 the VideoLAN team + * $Id$ * * Authors: Vincent Seguin * Samuel Hocevar - * Gildas Bazin + * Gildas Bazin + * Derk-Jan Hartman + * 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 @@ -20,22 +22,44 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, 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 /***************************************************************************** - * main: parse command line, start interface and spawn threads + * Local prototypes. *****************************************************************************/ -int main(int i_argc, char *ppsz_argv[]) +#if !defined(WIN32) && !defined(UNDER_CE) +static void SigHandler ( int i_signal ); +#endif + +extern void rootwrap( void ); + +/***************************************************************************** + * main: parse command line, start interface and spawn threads. + *****************************************************************************/ +int main( int i_argc, char *ppsz_argv[] ) { - vlc_error_t err; + int i_ret; + +#ifndef __APPLE__ + /* This clutters OSX GUI error logs */ + fprintf( stderr, "VLC media player %s\n", VLC_Version() ); +#endif -#ifdef SYS_LINUX +#ifdef HAVE_PUTENV # ifdef DEBUG /* Activate malloc checking routines to detect heap corruptions. */ putenv( "MALLOC_CHECK_=2" ); @@ -43,49 +67,125 @@ 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 ) + rootwrap (); + + /* 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 ); +#if !defined(WIN32) && !defined(UNDER_CE) + /* 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 - /* Add a blocking interface and keep the return value */ - err = vlc_add_intf( NULL, VLC_TRUE ); + /* Initialize libvlc */ + i_ret = VLC_Init( 0, i_argc, ppsz_argv ); + if( i_ret < 0 ) + { + VLC_Destroy( 0 ); + return i_ret == VLC_EEXITSUCCESS ? 0 : i_ret; + } + + i_ret = VLC_AddIntf( 0, NULL, VLC_TRUE, VLC_TRUE ); + + /* Finish the threads */ + VLC_CleanUp( 0 ); + + /* Destroy the libvlc structure */ + VLC_Destroy( 0 ); + + return i_ret; +} + +#if !defined(WIN32) && !defined(UNDER_CE) +/***************************************************************************** + * 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; - /* Finish the interface */ - vlc_stop(); + /* 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 */ - /* Finish all threads */ - vlc_end(); + if( !b_die ) + { + b_die = VLC_TRUE; + abort_time = time( NULL ); - /* Destroy the vlc structure */ - vlc_destroy(); + fprintf( stderr, "signal %d received, terminating vlc - do it " + "again in case it gets stuck\n", i_signal ); - return err; + /* 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" ); + + abort(); + } } +#endif +#if defined(UNDER_CE) +# if defined( _MSC_VER ) && defined( UNDER_CE ) +# include "vlc_common.h" +# endif +/***************************************************************************** + * WinMain: parse command line, start interface and spawn threads. (WinCE only) + *****************************************************************************/ +int WINAPI WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, + LPTSTR lpCmdLine, int nCmdShow ) +{ + char **argv, psz_cmdline[MAX_PATH]; + int argc, i_ret; + + WideCharToMultiByte( CP_ACP, 0, lpCmdLine, -1, + psz_cmdline, MAX_PATH, NULL, NULL ); + + argv = vlc_parse_cmdline( psz_cmdline, &argc ); + argv = realloc( argv, (argc + 1) * sizeof(char *) ); + if( !argv ) return -1; + + if( argc ) memmove( argv + 1, argv, argc * sizeof(char *) ); + argv[0] = ""; /* Fake program path */ + + i_ret = main( argc + 1, argv ); + + /* No need to free the argv memory */ + return i_ret; +} +#endif