Cosmetic

[vlc] / src / vlc.c

diff --git a/src/vlc.c b/src/vlc.c
index f1d34dcfd9e768c87693be396a73b13b1ba170b9..c84e7f177db5ec783e0ed8de61d58a602fe5e9a8 100644 (file)
--- a/src/vlc.c
+++ b/src/vlc.c
@@ -25,7 +25,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
 
 #include <vlc/vlc.h>
 #include <stdio.h>
@@ -45,21 +47,19 @@ extern char *FromLocale (const char *);
 #include <windows.h>
 extern void __wgetmainargs(int *argc, wchar_t ***wargv, wchar_t ***wenviron,
                            int expand_wildcards, int *startupinfo);
-static inline void Kill(void) { }
 #else
 
 # include <signal.h>
 # include <time.h>
 # include <pthread.h>
 
-static void Kill (void);
 static void *SigHandler (void *set);
 #endif
 
 /*****************************************************************************
  * main: parse command line, start interface and spawn threads.
  *****************************************************************************/
-int main( int i_argc, char *ppsz_argv[] )
+int main( int i_argc, const char *ppsz_argv[] )
 {
     int i_ret;
 
@@ -67,13 +67,16 @@ int main( int i_argc, char *ppsz_argv[] )
 
 #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
-#   ifdef DEBUG
+#   ifndef NDEBUG
     /* Activate malloc checking routines to detect heap corruptions. */
     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( (char *)"GNOME_DISABLE_CRASH_DIALOG=1" );
@@ -84,13 +87,6 @@ int main( int i_argc, 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.
      *
@@ -178,28 +174,27 @@ int main( int i_argc, char *ppsz_argv[] )
     else
 #endif
     {
+        /* 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!
     }
 
+    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]);
@@ -215,7 +210,7 @@ int main( int i_argc, char *ppsz_argv[] )
     pthread_join (sigth, NULL);
 #endif
 
-    return -i_ret;
+    return i_ret;
 }
 
 #if !defined(WIN32) && !defined(UNDER_CE)
@@ -236,7 +231,8 @@ static void *SigHandler (void *data)
     for (;;)
     {
         int i_signal, state;
-        (void)sigwait (&fullset, &i_signal);
+        if( sigwait (&fullset, &i_signal) != 0 )
+            continue;
 
 #ifdef __APPLE__
         /* In Mac OS X up to 10.4.8 sigwait (among others) is not a pthread
@@ -252,42 +248,35 @@ static void *SigHandler (void *data)
          * signals to a libvlc structure having been destroyed */
 
         pthread_setcancelstate (PTHREAD_CANCEL_DISABLE, &state);
-        if (abort_time == 0)
+        if (abort_time == 0 || time (NULL) > abort_time)
         {
             time (&abort_time);
             abort_time += 2;
 
             fprintf (stderr, "signal %d received, terminating vlc - do it "
-                            "again in case it gets stuck\n", i_signal);
-
-            /* Acknowledge the signal received */
-            Kill ();
+                            "again quickly in case it gets stuck\n", i_signal);
+            //VLC_Die( 0 );
         }
-        else
-        if (time (NULL) <= abort_time)
+        else /* time (NULL) <= abort_time */
         {
             /* If user asks again more than 2 seconds later, die badly */
             pthread_sigmask (SIG_UNBLOCK, exitset, NULL);
             fprintf (stderr, "user insisted too much, dying badly\n");
+#ifdef __APPLE__
+            /* On Mac OS X, use exit(-1) as it doesn't trigger
+             * backtrace generation, whereas abort() does.
+             * The backtrace generation trigger a Crash Dialog
+             * And takes way too much time, which is not what
+             * we want. */
+            exit (-1);
+#else
             abort ();
+#endif
         }
         pthread_setcancelstate (state, NULL);
     }
     /* 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)