#include <vlc/libvlc.h>
#include <vlc_interface.h>
+#include <vlc_vlm.h>
#include <stdarg.h>
#include <limits.h>
{
fprintf( stderr, "*** LibVLC Exception not handled: %s\nSet a breakpoint in '%s' to debug.\n",
psz, __func__ );
+ abort();
}
void libvlc_exception_raise( libvlc_exception_t *p_exception,
{
libvlc_instance_t *p_new;
int i_ret;
+
+ libvlc_init_threads ();
+
libvlc_int_t *p_libvlc_int = libvlc_InternalCreate();
- if( !p_libvlc_int ) RAISENULL( "VLC initialization failed" );
+ if( !p_libvlc_int )
+ {
+ libvlc_deinit_threads ();
+ RAISENULL( "VLC initialization failed" );
+ }
p_new = malloc( sizeof( libvlc_instance_t ) );
- if( !p_new ) RAISENULL( "Out of memory" );
+ if( !p_new )
+ {
+ libvlc_deinit_threads ();
+ RAISENULL( "Out of memory" );
+ }
const char *my_argv[argc + 2];
{
libvlc_InternalDestroy( p_libvlc_int );
free( p_new );
+ libvlc_deinit_threads ();
+
if( i_ret == VLC_EEXITSUCCESS )
return NULL;
else
}
p_new->p_libvlc_int = p_libvlc_int;
- p_new->p_vlm = NULL;
- p_new->p_event_manager = NULL;
+ p_new->libvlc_vlm.p_vlm = NULL;
+ p_new->libvlc_vlm.p_event_manager = NULL;
+ p_new->libvlc_vlm.pf_release = NULL;
p_new->b_playlist_locked = 0;
p_new->ref_count = 1;
p_new->verbosity = 1;
vlc_mutex_t *lock = &p_instance->instance_lock;
int refs;
- assert( p_instance->ref_count > 0 );
-
vlc_mutex_lock( lock );
+ assert( p_instance->ref_count > 0 );
refs = --p_instance->ref_count;
vlc_mutex_unlock( lock );
{
vlc_mutex_destroy( lock );
vlc_mutex_destroy( &p_instance->event_callback_lock );
- if( p_instance->p_event_manager )
- libvlc_event_manager_release( p_instance->p_event_manager );
+ if( p_instance->libvlc_vlm.pf_release )
+ p_instance->libvlc_vlm.pf_release( p_instance );
libvlc_InternalCleanup( p_instance->p_libvlc_int );
libvlc_InternalDestroy( p_instance->p_libvlc_int );
free( p_instance );
+ libvlc_deinit_threads ();
}
}
-void libvlc_add_intf( libvlc_instance_t *p_i, const char *name,
+int libvlc_add_intf( libvlc_instance_t *p_i, const char *name,
libvlc_exception_t *p_e )
{
if( libvlc_InternalAddIntf( p_i->p_libvlc_int, name ) )
- RAISEVOID( "Interface initialization failed" );
+ {
+ libvlc_exception_raise( p_e, "Interface initialization failed" );
+ return -1;
+ }
+ return 0;
}
void libvlc_wait( libvlc_instance_t *p_i )
libvlc_InternalWait( p_libvlc );
}
-int libvlc_get_vlc_id( libvlc_instance_t *p_instance )
-{
- assert( p_instance );
- return 1;
-}
-
const char * libvlc_get_version(void)
{
return VLC_Version();
const char * libvlc_get_changeset(void)
{
- return "exported";
+ extern const char psz_vlc_changeset[];
+ return psz_vlc_changeset;
}
/* export internal libvlc_instance for ugly hacks with libvlccore */