#include <stdlib.h>
#include <locale.h>
+#ifdef __APPLE__
+#include <string.h>
+#endif
+
/* Explicit HACK */
extern void LocaleFree (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! */
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!
+ argv[argc] = NULL;
- libvlc_exception_t ex, dummy;
+ libvlc_exception_t ex;
libvlc_exception_init (&ex);
- libvlc_exception_init (&dummy);
/* Initialize libvlc */
libvlc_instance_t *vlc = libvlc_new (argc, argv, &ex);
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, "globalhotkeys,none", &ex);
- libvlc_exception_clear (&ex);
- 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_errmsg() );
-
- 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 vlc == NULL || libvlc_exception_raised (&ex);
}