X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fvlc.c;h=7654a2e727e17557553505d9252f1f67362fd28d;hb=4eb07beac6e692cfcae86ef4a065caedc17b33ea;hp=55fed1d3c6d991a7c4c9879e066ccdeb8d180480;hpb=b321beb4ac88fb3d032b0f0132a8ce7348b52f89;p=vlc diff --git a/src/vlc.c b/src/vlc.c index 55fed1d3c6..7654a2e727 100644 --- a/src/vlc.c +++ b/src/vlc.c @@ -1,7 +1,7 @@ /***************************************************************************** - * vlc.c: the vlc player + * vlc.c: the VLC player ***************************************************************************** - * Copyright (C) 1998-2004 the VideoLAN team + * Copyright (C) 1998-2008 the VideoLAN team * $Id$ * * Authors: Vincent Seguin @@ -25,8 +25,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -#include "config.h" - #ifdef HAVE_CONFIG_H # include "config.h" #endif @@ -35,33 +33,17 @@ #include #include #include -#ifdef __GLIBC__ -#include -#endif /* Explicit HACK */ extern void LocaleFree (const char *); extern char *FromLocale (const char *); - -/***************************************************************************** - * Local prototypes. - *****************************************************************************/ -#ifdef WIN32 -#include -extern void __wgetmainargs(int *argc, wchar_t ***wargv, wchar_t ***wenviron, - int expand_wildcards, int *startupinfo); -static inline void Kill(void) { } -#else - # include # include # include -static void Kill (void); static void *SigHandler (void *set); -#endif /***************************************************************************** * main: parse command line, start interface and spawn threads. @@ -70,25 +52,11 @@ int main( int i_argc, const char *ppsz_argv[] ) { int i_ret; -# ifdef __GLIBC__ - if (dlsym (RTLD_NEXT, "inet6_rth_add") && !dlsym (RTLD_NEXT, "qsort_r")) - { - /* Way too many Linux users have glibc 2.5-2.7 that keeps crashing - * inside its non-thread-safe dcgettext(). */ - /* Hopefully glibc 2.8 will eventually work, not sure though */ - fprintf (stderr, -"***************************************************\n" -"*** glibc version with broken libintl detected. ***\n" -"*** Messages localization will be disabled. ***\n" -"***************************************************\n"); - setenv ("LC_MESSAGES", "C", 1); - } -# endif setlocale (LC_ALL, ""); #ifndef __APPLE__ /* This clutters OSX GUI error logs */ - fprintf( stderr, "VLC media player %s\n", VLC_Version() ); + fprintf( stderr, "VLC media player %s\n", libvlc_get_version() ); #endif #ifdef HAVE_PUTENV @@ -108,14 +76,6 @@ int main( int i_argc, const char *ppsz_argv[] ) /* FIXME: rootwrap (); */ #endif - /* Create a libvlc structure */ - i_ret = VLC_Create(); - if( i_ret < 0 ) - { - return -i_ret; - } - -#if !defined(WIN32) && !defined(UNDER_CE) /* Synchronously intercepted POSIX signals. * * In a threaded program such as VLC, the only sane way to handle signals @@ -158,77 +118,31 @@ int main( int i_argc, const char *ppsz_argv[] ) sigdelset (&set, dummysigs[i]); pthread_create (&sigth, NULL, SigHandler, &set); -#endif -#ifdef WIN32 - /* Replace argv[1..n] with unicode for Windows NT and above */ - if( GetVersion() < 0x80000000 ) - { - wchar_t **wargv, **wenvp; - int i,i_wargc; - int si = { 0 }; - __wgetmainargs(&i_wargc, &wargv, &wenvp, 0, &si); + /* 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! - for( i = 0; i < i_wargc; i++ ) - { - int len = WideCharToMultiByte(CP_UTF8, 0, wargv[i], -1, NULL, 0, NULL, NULL); - if( len > 0 ) - { - if( len > 1 ) { - char *utf8arg = (char *)malloc(len); - if( NULL != utf8arg ) - { - WideCharToMultiByte(CP_UTF8, 0, wargv[i], -1, utf8arg, len, NULL, NULL); - ppsz_argv[i] = utf8arg; - } - else - { - /* failed!, quit */ - return 1; - } - } - else - { - ppsz_argv[i] = strdup (""); - } - } - else - { - /* failed!, quit */ - return 1; - } - } - } - else -#endif - { - for (int i = 0; i < i_argc; i++) - if ((ppsz_argv[i] = FromLocale (ppsz_argv[i])) == NULL) - return 1; // BOOM! - } + libvlc_exception_t ex; + libvlc_exception_init (&ex); /* Initialize libvlc */ - i_ret = VLC_Init( 0, i_argc, ppsz_argv ); - if( i_ret < 0 ) + 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); + + if (vlc != NULL) { - VLC_Destroy( 0 ); - return i_ret == VLC_EEXITSUCCESS ? 0 : -i_ret; + libvlc_run_interface (vlc, NULL, &ex); + libvlc_release (vlc); } - - i_ret = VLC_AddIntf( 0, NULL, VLC_TRUE, VLC_TRUE ); - - /* Finish the threads */ - VLC_CleanUp( 0 ); - - Kill (); - - /* Destroy the libvlc structure */ - VLC_Destroy( 0 ); + i_ret = libvlc_exception_raised (&ex); + libvlc_exception_clear (&ex); for (int i = 0; i < i_argc; i++) LocaleFree (ppsz_argv[i]); -#if !defined(WIN32) && !defined(UNDER_CE) pthread_cancel (sigth); # ifdef __APPLE__ /* In Mac OS X up to 10.4.8 sigwait (among others) is not a pthread @@ -237,12 +151,10 @@ int main( int i_argc, const char *ppsz_argv[] ) pthread_kill (sigth, SIGQUIT); # endif pthread_join (sigth, NULL); -#endif - return -i_ret; + return i_ret; } -#if !defined(WIN32) && !defined(UNDER_CE) /***************************************************************************** * SigHandler: system signal handler ***************************************************************************** @@ -284,9 +196,7 @@ static void *SigHandler (void *data) fprintf (stderr, "signal %d received, terminating vlc - do it " "again quickly in case it gets stuck\n", i_signal); - - /* Acknowledge the signal received */ - Kill (); + //VLC_Die( 0 ); } else /* time (NULL) <= abort_time */ { @@ -308,47 +218,3 @@ static void *SigHandler (void *data) } /* Never reached */ } - - -static void KillOnce (void) -{ - VLC_Die (0); -} - -static void Kill (void) -{ - static pthread_once_t once = PTHREAD_ONCE_INIT; - pthread_once (&once, KillOnce); -} - -#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