X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=bin%2Fvlc.c;h=657b1be84b207df72aab55b7bd3e984010d63e44;hb=5a477c259b7d963ec8757348f01db81a1d39387d;hp=3a15722d77e4f8094a75c27784026f8e1c368721;hpb=0e1e17e1b8f59fcb95897a7cf53e078c19430eb3;p=vlc

diff --git a/bin/vlc.c b/bin/vlc.c
index 3a15722d77..657b1be84b 100644
--- a/bin/vlc.c
+++ b/bin/vlc.c
@@ -34,6 +34,10 @@
 #include <stdlib.h>
 #include <locale.h>
 
+#ifdef __APPLE__
+#include <string.h>
+#endif
+
 
 /* Explicit HACK */
 extern void LocaleFree (const char *);
@@ -49,7 +53,11 @@ extern char *FromLocale (const char *);
  *****************************************************************************/
 int main( int i_argc, const char *ppsz_argv[] )
 {
-    int i_ret;
+#ifdef __APPLE__
+    /* The so-called POSIX-compliant MacOS X is not. 
+     * SIGPIPE fires even when it is blocked in all threads! */
+    signal (SIGPIPE, SIG_IGN);
+#endif
 
 #ifndef ALLOW_RUN_AS_ROOT
     if (geteuid () == 0)
@@ -73,9 +81,6 @@ int main( int i_argc, const char *ppsz_argv[] )
 #   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" );
@@ -85,7 +90,7 @@ int main( int i_argc, const char *ppsz_argv[] )
     /* 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
+     * is to block them in all threads 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.
@@ -123,48 +128,48 @@ int main( int i_argc, const char *ppsz_argv[] )
     const char *argv[i_argc + 3];
     int argc = 0;
 
+    argv[argc++] = "--no-ignore-config";
 #ifdef TOP_BUILDDIR
     argv[argc++] = FromLocale ("--plugin-path="TOP_BUILDDIR"/modules");
 #endif
 #ifdef TOP_SRCDIR
-# ifdef ENABLE_HTTPD
-    argv[argc++] = FromLocale ("--http-src="TOP_SRCDIR"/share/http");
-# endif
+    argv[argc++] = FromLocale ("--data-path="TOP_SRCDIR"/share");
 #endif
 
-    for (int i = 1; i < i_argc; i++)
+    int i = 1;
+#ifdef __APPLE__
+    /* When VLC.app is run by double clicking in Mac OS X, the 2nd arg
+     * is the PSN - process serial number (a unique PID-ish thingie)
+     * still ok for real Darwin & when run from command line
+     * for example -psn_0_9306113 */
+    if(i_argc >= 2 && !strncmp( ppsz_argv[1] , "-psn" , 4 ))
+        i = 2;
+#endif
+    for (; i < i_argc; i++)
         if ((argv[argc++] = FromLocale (ppsz_argv[i])) == NULL)
             return 1; // BOOM!
-
-    libvlc_exception_t ex, dummy;
-    libvlc_exception_init (&ex);
-    libvlc_exception_init (&dummy);
+    argv[argc] = NULL;
 
     /* Initialize libvlc */
-    libvlc_instance_t *vlc = libvlc_new (argc, argv, &ex);
+    libvlc_instance_t *vlc = libvlc_new (argc, argv);
 
     if (vlc != NULL)
     {
-        libvlc_add_intf (vlc, "signals", &ex);
-        if (libvlc_exception_raised (&ex))
-        {
-            libvlc_exception_clear (&ex);
+        if (libvlc_add_intf (vlc, "signals"))
             pthread_sigmask (SIG_UNBLOCK, &set, NULL);
+#if !defined (HAVE_MAEMO)
+        libvlc_add_intf (vlc, "globalhotkeys,none");
+#endif
+        if (libvlc_add_intf (vlc, NULL) == 0)
+        {
+            libvlc_playlist_play (vlc, -1, 0, NULL);
+            libvlc_wait (vlc);
         }
-        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));
-
-    libvlc_exception_clear (&ex);
-    libvlc_exception_clear (&dummy);
 
-    for (int i = 0; i < argc; i++)
+    for (int i = 1; i < argc; i++)
         LocaleFree (argv[i]);
 
-    return i_ret;
+    return 0;
 }