#include <vlc/libvlc.h>
#include <vlc_interface.h>
+#include <vlc_vlm.h>
#include <stdarg.h>
#include <limits.h>
void libvlc_exception_clear( libvlc_exception_t *p_exception )
{
+ if( NULL == p_exception )
+ return;
if( p_exception->psz_message != nomemstr )
free( p_exception->psz_message );
p_exception->psz_message = NULL;
/* Print something, so that lazy third-parties can easily
* notice that something may have gone unnoticedly wrong */
libvlc_exception_not_handled( psz );
+ if( psz != nomemstr )
+ free( psz );
return;
}
p_new->p_libvlc_int = p_libvlc_int;
p_new->p_vlm = NULL;
+ p_new->p_event_manager = NULL;
p_new->b_playlist_locked = 0;
p_new->ref_count = 1;
+ p_new->verbosity = 1;
p_new->p_callback_list = NULL;
vlc_mutex_init(&p_new->instance_lock);
vlc_mutex_init(&p_new->event_callback_lock);
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->p_vlm )
+ vlm_Delete( p_instance->p_vlm );
libvlc_InternalCleanup( p_instance->p_libvlc_int );
libvlc_InternalDestroy( p_instance->p_libvlc_int );
free( p_instance );
const char * libvlc_get_changeset(void)
{
- return VLC_Changeset();
+ extern const char psz_vlc_changeset[];
+ return psz_vlc_changeset;
}
/* export internal libvlc_instance for ugly hacks with libvlccore */
vlc_object_hold( p_instance->p_libvlc_int ) ;
return (vlc_object_t*) p_instance->p_libvlc_int ;
}
+
+void libvlc_free( void *ptr )
+{
+ free( ptr );
+}