Ugly hack to enable really quiet running of VLC.

[vlc] / bin / vlc.c

diff --git a/bin/vlc.c b/bin/vlc.c
index 2633f84cbb3028dac219032ed07285e53023c67d..8949fd5f6005e8383623bcec6f66be9110db9b02 100644 (file)
--- a/bin/vlc.c
+++ b/bin/vlc.c
@@ -47,6 +47,7 @@ extern char *FromLocale (const char *);
 #include <time.h>
 #include <pthread.h>
 #include <unistd.h>
+#include <string.h>
 
 /*****************************************************************************
  * main: parse command line, start interface and spawn threads.
@@ -54,7 +55,7 @@ extern char *FromLocale (const char *);
 int main( int i_argc, const char *ppsz_argv[] )
 {
 #ifdef __APPLE__
-    /* The so-called POSIX-compliant MacOS X is not. 
+    /* The so-called POSIX-compliant MacOS X is not.
      * SIGPIPE fires even when it is blocked in all threads! */
     signal (SIGPIPE, SIG_IGN);
 #endif
@@ -74,7 +75,8 @@ int main( int i_argc, const char *ppsz_argv[] )
 
 #ifndef __APPLE__
     /* This clutters OSX GUI error logs */
-    fprintf( stderr, "VLC media player %s\n", libvlc_get_version() );
+    if (i_argc > 1 && strcmp(ppsz_argv[1], "--quiet")) /* dirty hack to enable really quiet runing of vlc */
+        fprintf( stderr, "VLC media player %s\n", libvlc_get_version() );
 #endif
 
 #ifdef HAVE_PUTENV
@@ -150,12 +152,8 @@ int main( int i_argc, const char *ppsz_argv[] )
             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)
     {
@@ -164,14 +162,16 @@ int main( int i_argc, const char *ppsz_argv[] )
 #if !defined (HAVE_MAEMO)
         libvlc_add_intf (vlc, "globalhotkeys,none");
 #endif
-        libvlc_add_intf (vlc, NULL);
-        libvlc_playlist_play (vlc, -1, 0, NULL, &dummy);
-        libvlc_wait (vlc);
+        if (libvlc_add_intf (vlc, NULL) == 0)
+        {
+            libvlc_playlist_play (vlc, -1, 0, NULL);
+            libvlc_wait (vlc);
+        }
         libvlc_release (vlc);
     }
 
     for (int i = 1; i < argc; i++)
         LocaleFree (argv[i]);
 
-    return vlc == NULL || libvlc_exception_raised (&ex);
+    return 0;
 }