X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=bin%2Fvlc.c;h=657b1be84b207df72aab55b7bd3e984010d63e44;hb=b3a59c07e71c74191c2d1524dbd2f5412dd762db;hp=de2b87851d2b6d79c733d7cb559714821411bb36;hpb=a8421c5730af2951f205d018de90f4a234bda4c9;p=vlc

diff --git a/bin/vlc.c b/bin/vlc.c
index de2b87851d..657b1be84b 100644
--- a/bin/vlc.c
+++ b/bin/vlc.c
@@ -90,7 +90,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,12 +150,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)
     {
@@ -166,7 +162,7 @@ int main( int i_argc, const char *ppsz_argv[] )
 #endif
         if (libvlc_add_intf (vlc, NULL) == 0)
         {
-            libvlc_playlist_play (vlc, -1, 0, NULL, &dummy);
+            libvlc_playlist_play (vlc, -1, 0, NULL);
             libvlc_wait (vlc);
         }
         libvlc_release (vlc);
@@ -175,5 +171,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;
 }