Fix spelling.

[vlc] / bin / vlc.c

diff --git a/bin/vlc.c b/bin/vlc.c
index b76d8fb121c1c7353097f41cffd48f07d99ccbff..f9c9eff7a3f535bc9366cbbccb4ebd62b170405a 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
@@ -90,7 +92,7 @@ int main( int i_argc, const char *ppsz_argv[] )
     /* 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.
@@ -150,11 +152,8 @@ int main( int i_argc, const char *ppsz_argv[] )
             return 1; // BOOM!
     argv[argc] = NULL;
 
-    libvlc_exception_t ex;
-    libvlc_exception_init (&ex);
-
     /* Initialize libvlc */
-    libvlc_instance_t *vlc = libvlc_new (argc, argv, &ex);
+    libvlc_instance_t *vlc = libvlc_new (argc, argv);
 
     if (vlc != NULL)
     {
@@ -174,5 +173,5 @@ int main( int i_argc, const char *ppsz_argv[] )
     for (int i = 1; i < argc; i++)
         LocaleFree (argv[i]);
 
-    return vlc == NULL || libvlc_exception_raised (&ex);
+    return 0;
 }