#include <stdlib.h>
#include <locale.h>
+#ifdef __APPLE__
+#include <string.h>
+#endif
+
/* Explicit HACK */
extern void LocaleFree (const char *);
#include <time.h>
#include <pthread.h>
#include <unistd.h>
+#include <dlfcn.h>
/*****************************************************************************
* main: parse command line, start interface and spawn threads.
#ifndef __APPLE__
/* This clutters OSX GUI error logs */
- fprintf( stderr, "VLC media player %s\n", libvlc_get_version() );
+ fprintf( stderr, "VLC media player %s (revision %s)\n",
+ libvlc_get_version(), libvlc_get_changeset() );
#endif
#ifdef HAVE_PUTENV
/* 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.
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_init (&ex);
- libvlc_exception_init (&dummy);
-
/* 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, "globalhotkeys,none", &ex);
- libvlc_exception_clear (&ex);
- libvlc_add_intf (vlc, NULL, &ex);
- libvlc_playlist_play (vlc, -1, 0, NULL, &dummy);
- libvlc_wait (vlc);
-
- if (libvlc_exception_raised (&ex))
- fprintf( stderr, "%s\n", libvlc_errmsg() );
libvlc_release (vlc);
}
for (int i = 1; i < argc; i++)
LocaleFree (argv[i]);
- return vlc == NULL || libvlc_exception_raised (&ex);
+#ifdef RTLD_NOLOAD
+ /* Avoid crash in KIO scheduler cleanup. */
+ /* This is ugly, but we get way too many crash reports due to this. */
+ if (dlopen ("libkfilemodule.so", RTLD_LAZY|RTLD_LOCAL|RTLD_NOLOAD) != NULL)
+ {
+ fprintf (stderr, "KFile plugin present. Unclean shutdown!\n");
+ _exit (0);
+ }
+#endif
+ return 0;
}