X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fvlc.c;h=2ede9433e4b67ff029654d1266ec13cec7cb9369;hb=5ad6561ceab66b046b648e7651ed63c071d6012d;hp=068f226e9f834d411b3666baffc086abb6e9d3ac;hpb=7f0d9408c2d0afe973e90b1426b50fc8587d5be2;p=vlc diff --git a/src/vlc.c b/src/vlc.c index 068f226e9f..2ede9433e4 100644 --- a/src/vlc.c +++ b/src/vlc.c @@ -1,12 +1,14 @@ /***************************************************************************** - * vlc.c: the vlc player + * vlc.c: the VLC player ***************************************************************************** - * Copyright (C) 1998-2001 VideoLAN - * $Id: vlc.c,v 1.3 2002/07/03 19:40:49 sam Exp $ + * Copyright (C) 1998-2008 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,78 +22,134 @@ * * 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 /* fprintf() */ -#include /* putenv(), strtol(), */ + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif #include +#include +#include +#include + + +/* Explicit HACK */ +extern void LocaleFree (const char *); +extern char *FromLocale (const char *); + +#include +#include +#include +#include /***************************************************************************** - * main: parse command line, start interface and spawn threads + * main: parse command line, start interface and spawn threads. *****************************************************************************/ -int main(int i_argc, char *ppsz_argv[], char *ppsz_env[]) +int main( int i_argc, const char *ppsz_argv[] ) { - vlc_t *p_vlc; - vlc_error_t err; + int i_ret; + + if (geteuid () == 0) + { + fprintf (stderr, "VLC is not supposed to be run as root. Sorry.\n" + "If you need to use real-time priorities and/or privileged TCP ports\n" + "you can use %s-wrapper (make sure it is Set-UID root first and\n" + "cannot be run by non-trusted users first).\n", ppsz_argv[0]); + return 1; + } + + setlocale (LC_ALL, ""); + +#ifndef __APPLE__ + /* This clutters OSX GUI error logs */ + fprintf( stderr, "VLC media player %s\n", libvlc_get_version() ); +#endif -#ifdef SYS_LINUX -# ifdef DEBUG +#ifdef HAVE_PUTENV +# ifndef NDEBUG /* Activate malloc checking routines to detect heap corruptions. */ - putenv( "MALLOC_CHECK_=2" ); + putenv( (char*)"MALLOC_CHECK_=2" ); +# ifdef __APPLE__ + putenv( (char*)"MallocErrorAbort=crash_my_baby_crash" ); +# endif /* Disable the ugly Gnome crash dialog so that we properly segfault */ - putenv( "GNOME_DISABLE_CRASH_DIALOG=1" ); + putenv( (char *)"GNOME_DISABLE_CRASH_DIALOG=1" ); # endif #endif - /* Create the vlc structure */ - p_vlc = vlc_create(); - if( p_vlc == NULL ) - { - return -1; - } +#if defined (HAVE_GETEUID) && !defined (SYS_BEOS) + /* FIXME: rootwrap (); */ +#endif - /* Initialize vlc */ - err = vlc_init( p_vlc, i_argc, ppsz_argv ); - if( err != VLC_SUCCESS ) - { - vlc_destroy( p_vlc ); - return err; - } + /* Synchronously intercepted POSIX signals. + * + * In a threaded program such as VLC, the only sane way to handle signals + * is to block them in all thread but one - this is the only way to + * predict which thread will receive them. If any piece of code depends + * on delivery of one of this signal it is intrinsically not thread-safe + * and MUST NOT be used in VLC, whether we like it or not. + * There is only one exception: if the signal is raised with + * pthread_kill() - we do not use this in LibVLC but some pthread + * implementations use them internally. You should really use conditions + * for thread synchronization anyway. + * + * Signal that request a clean shutdown, and force an unclean shutdown + * if they are triggered again 2+ seconds later. + * We have to handle SIGTERM cleanly because of daemon mode. + * Note that we set the signals after the vlc_create call. */ + static const int sigs[] = { + SIGINT, SIGHUP, SIGQUIT, SIGTERM, + /* Signals that cause a no-op: + * - SIGPIPE might happen with sockets and would crash VLC. It MUST be + * blocked by any LibVLC-dependent application, in addition to VLC. + * - SIGCHLD is comes after exec*() (such as httpd CGI support) and must + * be dequeued to cleanup zombie processes. + */ + SIGPIPE, SIGCHLD + }; + + sigset_t set; + sigemptyset (&set); + for (unsigned i = 0; i < sizeof (sigs) / sizeof (sigs[0]); i++) + sigaddset (&set, sigs[i]); + + /* Block all these signals */ + pthread_sigmask (SIG_BLOCK, &set, NULL); - //vlc_add( p_vlc, "/home/sam/videolan/streams/mpeg/axe.mpeg" ); + /* Note that FromLocale() can be used before libvlc is initialized */ + for (int i = 0; i < i_argc; i++) + if ((ppsz_argv[i] = FromLocale (ppsz_argv[i])) == NULL) + return 1; // BOOM! - /* Run vlc, in non-blocking mode */ - err = vlc_run( p_vlc ); + libvlc_exception_t ex, dummy; + libvlc_exception_init (&ex); + libvlc_exception_init (&dummy); - /* Add background interfaces */ - //{ int i; for( i=10; i--; ) vlc_add_intf( p_vlc, "dummy", 0 ); } - vlc_add_intf( p_vlc, "dummy", VLC_FALSE ); - vlc_add_intf( p_vlc, "logger", VLC_FALSE ); - //vlc_add_intf( p_vlc, "xosd", VLC_FALSE ); - //vlc_add_intf( p_vlc, "kde", VLC_FALSE ); - vlc_add_intf( p_vlc, "rc", VLC_FALSE ); + /* Initialize libvlc */ + int i_argc_real = i_argc ? i_argc - 1 : 0; + const char **ppsz_argv_real = i_argc ? &ppsz_argv[1] : ppsz_argv; + libvlc_instance_t *vlc = libvlc_new (i_argc_real, ppsz_argv_real, &ex); - /* Add a blocking interface */ - err = vlc_add_intf( p_vlc, NULL, VLC_TRUE ); - if( err != VLC_SUCCESS ) + if (vlc != NULL) { - vlc_end( p_vlc ); - vlc_destroy( p_vlc ); - return err; + libvlc_add_intf (vlc, "signals", &dummy); + libvlc_add_intf (vlc, NULL, &ex); + libvlc_playlist_play (vlc, -1, 0, NULL, &dummy); + libvlc_wait (vlc); + libvlc_release (vlc); } + i_ret = libvlc_exception_raised (&ex); + if( i_ret ) + fprintf( stderr, "%s\n", libvlc_exception_get_message( &ex)); - /* Finish the interface */ - vlc_stop( p_vlc ); + libvlc_exception_clear (&ex); + libvlc_exception_clear (&dummy); - /* Finish all threads */ - vlc_end( p_vlc ); + for (int i = 0; i < i_argc; i++) + LocaleFree (ppsz_argv[i]); - /* Destroy the vlc structure */ - vlc_destroy( p_vlc ); - - return 0; + return i_ret; } -