Add --data-path option. Access the src share directory now works from build tree.

[vlc] / bin / vlc.c

diff --git a/bin/vlc.c b/bin/vlc.c
index e752b0536d93254210e82eace46c4df7f11b5c8e..246ea149d52aa2208e17755fcb25303374d814ee 100644 (file)
--- 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 *);
@@ -129,12 +133,19 @@ int main( int i_argc, const char *ppsz_argv[] )
     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!
     argv[argc] = NULL;
@@ -154,7 +165,9 @@ int main( int i_argc, const char *ppsz_argv[] )
             libvlc_exception_clear (&ex);
             pthread_sigmask (SIG_UNBLOCK, &set, NULL);
         }
+#if !defined (HAVE_MAEMO)
         libvlc_add_intf (vlc, "globalhotkeys,none", &ex);
+#endif
         libvlc_exception_clear (&ex);
         libvlc_add_intf (vlc, NULL, &ex);
         libvlc_playlist_play (vlc, -1, 0, NULL, &dummy);
@@ -165,7 +178,7 @@ int main( int i_argc, const char *ppsz_argv[] )
         libvlc_release (vlc);
     }
 
-    for (int i = 0; i < argc; i++)
+    for (int i = 1; i < argc; i++)
         LocaleFree (argv[i]);
 
     return vlc == NULL || libvlc_exception_raised (&ex);