Commit cec206c3 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

libvlc_add_intf: remove dummy exception parameter

parent d91fcec7
......@@ -159,17 +159,12 @@ int main( int i_argc, const char *ppsz_argv[] )
if (vlc != NULL)
{
libvlc_add_intf (vlc, "signals", &ex);
if (libvlc_exception_raised (&ex))
{
libvlc_exception_clear (&ex);
if (libvlc_add_intf (vlc, "signals"))
pthread_sigmask (SIG_UNBLOCK, &set, NULL);
}
#if !defined (HAVE_MAEMO)
libvlc_add_intf (vlc, "globalhotkeys,none", &ex);
libvlc_add_intf (vlc, "globalhotkeys,none");
#endif
libvlc_exception_clear (&ex);
libvlc_add_intf (vlc, NULL, &ex);
libvlc_add_intf (vlc, NULL);
libvlc_playlist_play (vlc, -1, 0, NULL, &dummy);
libvlc_wait (vlc);
......
......@@ -171,8 +171,8 @@ int WINAPI WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance,
vlc = libvlc_new (argc, (const char **)argv, &ex);
if (vlc != NULL)
{
libvlc_add_intf (vlc, "globalhotkeys,none", &ex);
libvlc_add_intf (vlc, NULL, &ex);
libvlc_add_intf (vlc, "globalhotkeys,none");
libvlc_add_intf (vlc, NULL);
libvlc_playlist_play (vlc, -1, 0, NULL, &dummy);
libvlc_wait (vlc);
libvlc_release (vlc);
......
......@@ -191,12 +191,10 @@ VLC_PUBLIC_API void libvlc_retain( libvlc_instance_t * );
*
* \param p_instance the instance
* \param name interface name, or NULL for default
* \param p_exception an initialized exception pointer
* \return 0 on success, -1 on error.
*/
VLC_PUBLIC_API
int libvlc_add_intf( libvlc_instance_t *p_instance, const char *name,
libvlc_exception_t *p_exception );
int libvlc_add_intf( libvlc_instance_t *p_instance, const char *name );
/**
* Waits until an interface causes the instance to exit.
......
......@@ -167,16 +167,9 @@ void libvlc_release( libvlc_instance_t *p_instance )
}
}
int libvlc_add_intf( libvlc_instance_t *p_i, const char *name,
libvlc_exception_t *p_e )
int libvlc_add_intf( libvlc_instance_t *p_i, const char *name )
{
if( libvlc_InternalAddIntf( p_i->p_libvlc_int, name ) )
{
libvlc_printerr("Interface initialization failed");
libvlc_exception_raise( p_e );
return -1;
}
return 0;
return libvlc_InternalAddIntf( p_i->p_libvlc_int, name ) ? -1 : 0;
}
void libvlc_wait( libvlc_instance_t *p_i )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment