Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

vlc: only print error message if LibVLC is initialized

  • Loading branch information...
commit 697041f622fae3788f23214ec0098ede13de7706 1 parent 8e290e4
Rémi Denis-Courmont authored
Showing with 4 additions and 9 deletions.
  1. +4 −9 bin/vlc.c
13 bin/vlc.c
View
@@ -49,8 +49,6 @@ extern char *FromLocale (const char *);
*****************************************************************************/
int main( int i_argc, const char *ppsz_argv[] )
{
- int i_ret;
-
#ifdef __APPLE__
/* The so-called POSIX-compliant MacOS X is not.
* SIGPIPE fires even when it is blocked in all threads! */
@@ -159,17 +157,14 @@ int main( int i_argc, const char *ppsz_argv[] )
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);
}
- i_ret = libvlc_exception_raised (&ex);
- if( i_ret )
- fprintf( stderr, "%s\n", libvlc_errmsg() );
-
- libvlc_exception_clear (&ex);
- libvlc_exception_clear (&dummy);
for (int i = 0; i < argc; i++)
LocaleFree (argv[i]);
- return i_ret;
+ return vlc == NULL || libvlc_exception_raised (&ex);
}
Please sign in to comment.
Something went wrong with that request. Please try again.