Add mx4n and mx4p FourCC

[vlc] / src / vlc.c

diff --git a/src/vlc.c b/src/vlc.c
index 3bd21ddc9b509433440e82827b5ba7b588a4db94..c84e7f177db5ec783e0ed8de61d58a602fe5e9a8 100644 (file)
--- a/src/vlc.c
+++ b/src/vlc.c
@@ -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,9 +33,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <locale.h>
-#ifdef __GLIBC__
-#include <dlfcn.h>
-#endif
 
 
 /* Explicit HACK */
@@ -52,14 +47,12 @@ 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
 
@@ -70,31 +63,20 @@ 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
-#   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" );
@@ -105,13 +87,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.
      *
@@ -199,28 +174,27 @@ int main( int i_argc, const 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]);
@@ -236,7 +210,7 @@ int main( int i_argc, const char *ppsz_argv[] )
     pthread_join (sigth, NULL);
 #endif
 
-    return -i_ret;
+    return i_ret;
 }
 
 #if !defined(WIN32) && !defined(UNDER_CE)
@@ -281,9 +255,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 */
         {
@@ -305,19 +277,6 @@ 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)