macosx: newly designed sidebar icons

[vlc] / bin / vlc.c

diff --git a/bin/vlc.c b/bin/vlc.c
index 4299bdf622d5f57eddf107ca148e246dc8aee291..4d20f89069d686e20a4f5cb5451cf9b9d7073a42 100644 (file)
--- a/bin/vlc.c
+++ b/bin/vlc.c
@@ -35,13 +35,20 @@
 #include <stdbool.h>
 #include <locale.h>
 #include <signal.h>
-#include <pthread.h>
+#ifdef HAVE_PTHREAD_H
+# include <pthread.h>
+#endif
 #include <unistd.h>
 
 #ifdef __APPLE__
 #include <string.h>
 #endif
 
+#ifdef __OS2__
+# define pthread_t      int
+# define pthread_self() _gettid()
+#endif
+
 
 /* Explicit HACK */
 extern void LocaleFree (const char *);
@@ -67,9 +74,14 @@ static bool signal_ignored (int signum)
 
 static void vlc_kill (void *data)
 {
+#ifndef __OS2__
     pthread_t *ps = data;
 
     pthread_kill (*ps, SIGTERM);
+#else
+    // send a signal to the main thread
+    kill (getpid(), SIGTERM);
+#endif
 }
 
 static void exit_timeout (int signum)
@@ -91,24 +103,22 @@ int main( int i_argc, const char *ppsz_argv[] )
     /* Restore SIGCHLD in case our parent process ignores it. */
     signal (SIGCHLD, SIG_DFL);
 
-#ifdef HAVE_SETENV
-# ifndef NDEBUG
+#ifndef NDEBUG
     /* Activate malloc checking routines to detect heap corruptions. */
     setenv ("MALLOC_CHECK_", "2", 1);
 
     /* Disable the ugly Gnome crash dialog so that we properly segfault */
     setenv ("GNOME_DISABLE_CRASH_DIALOG", "1", 1);
-# endif
+#endif
 
-# ifdef TOP_BUILDDIR
+#ifdef TOP_BUILDDIR
     setenv ("VLC_PLUGIN_PATH", TOP_BUILDDIR"/modules", 1);
-# endif
+#endif
 
     /* Clear the X.Org startup notification ID. Otherwise the UI might try to
      * change the environment while the process is multi-threaded. That could
      * crash. Screw you X.Org. Next time write a thread-safe specification. */
     unsetenv ("DESKTOP_STARTUP_ID");
-#endif
 
 #ifndef ALLOW_RUN_AS_ROOT
     if (geteuid () == 0)
@@ -123,11 +133,11 @@ int main( int i_argc, const char *ppsz_argv[] )
 
     setlocale (LC_ALL, "");
 
-#ifndef __APPLE__
-    /* This clutters OSX GUI error logs */
-    fprintf( stderr, "VLC media player %s (revision %s)\n",
-             libvlc_get_version(), libvlc_get_changeset() );
-#endif
+    if (isatty (STDERR_FILENO))
+        /* This message clutters error logs. It is printed only on a TTY.
+         * Fortunately, LibVLC prints version info with -vv anyway. */
+        fprintf (stderr, "VLC media player %s (revision %s)\n",
+                 libvlc_get_version(), libvlc_get_changeset());
 
     sigset_t set;
 
@@ -210,7 +220,7 @@ int main( int i_argc, const char *ppsz_argv[] )
 
     libvlc_set_user_agent (vlc, "VLC media player", "VLC/"PACKAGE_VERSION);
 
-#if !defined (HAVE_MAEMO) && !defined __APPLE__
+#if !defined (HAVE_MAEMO) && !defined __APPLE__ && !defined (__OS2__)
     libvlc_add_intf (vlc, "globalhotkeys,none");
 #endif
     if (libvlc_add_intf (vlc, NULL))
@@ -249,7 +259,7 @@ int main( int i_argc, const char *ppsz_argv[] )
 out:
     if (vlc != NULL)
         libvlc_release (vlc);
-    for (int i = 1; i < argc; i++)
+    for (int i = 2; i < argc; i++)
         LocaleFree (argv[i]);
 
     return 0;