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;
}
void libvlc_exception_raise( libvlc_exception_t *p_exception,
- const char *psz_format, ... )
+ const char *psz_format, ... )
{
va_list args;
char * psz;
/* Does caller care about exceptions ? */
if( p_exception == NULL ) {
- /* Print something, so lazy third-parties can easily
- * notice that something may have gone unoticedly wrong */
+ /* 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;
}
- /* Make sure that there is no unoticed previous exception */
+ /* Make sure that there is no unnoticed previous exception */
if( p_exception->b_raised )
{
libvlc_exception_not_handled( p_exception->psz_message );
libvlc_exception_t *p_e )
{
libvlc_instance_t *p_new;
-
+ int i_ret;
libvlc_int_t *p_libvlc_int = libvlc_InternalCreate();
if( !p_libvlc_int ) RAISENULL( "VLC initialization failed" );
- p_new = (libvlc_instance_t *)malloc( sizeof( libvlc_instance_t ) );
+ p_new = malloc( sizeof( libvlc_instance_t ) );
if( !p_new ) RAISENULL( "Out of memory" );
const char *my_argv[argc + 2];
/** \todo Look for interface settings. If we don't have any, add -I dummy */
/* Because we probably don't want a GUI by default */
- if( libvlc_InternalInit( p_libvlc_int, argc + 1, my_argv ) )
- RAISENULL( "VLC initialization failed" );
+ i_ret = libvlc_InternalInit( p_libvlc_int, argc + 1, my_argv );
+ if( i_ret )
+ {
+ libvlc_InternalDestroy( p_libvlc_int );
+ free( p_new );
+ if( i_ret == VLC_EEXITSUCCESS )
+ return NULL;
+ else
+ RAISENULL( "VLC initialization failed" );
+ }
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_libvlc_int, &p_new->instance_lock);
- vlc_mutex_init(p_libvlc_int, &p_new->event_callback_lock);
-
- libvlc_event_init(p_new, p_e);
+ vlc_mutex_init(&p_new->instance_lock);
+ vlc_mutex_init(&p_new->event_callback_lock);
return p_new;
}
vlc_mutex_lock( lock );
refs = --p_instance->ref_count;
- if( refs == 0 )
- libvlc_event_fini( p_instance );
vlc_mutex_unlock( lock );
if( refs == 0 )
{
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 );
libvlc_InternalCleanup( p_instance->p_libvlc_int );
- libvlc_InternalDestroy( p_instance->p_libvlc_int, false );
+ libvlc_InternalDestroy( p_instance->p_libvlc_int );
free( p_instance );
}
}
+void 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" );
+}
+
+void libvlc_wait( libvlc_instance_t *p_i )
+{
+ libvlc_int_t *p_libvlc = p_i->p_libvlc_int;
+ libvlc_InternalWait( p_libvlc );
+}
+
int libvlc_get_vlc_id( libvlc_instance_t *p_instance )
{
- return p_instance->p_libvlc_int->i_object_id;
+ assert( p_instance );
+ return 1;
}
-const char * libvlc_get_version()
+const char * libvlc_get_version(void)
{
return VLC_Version();
}
-const char * libvlc_get_compiler()
+const char * libvlc_get_compiler(void)
{
return VLC_Compiler();
}
-const char * libvlc_get_changeset()
+const char * libvlc_get_changeset(void)
+{
+ return "exported";
+}
+
+/* export internal libvlc_instance for ugly hacks with libvlccore */
+vlc_object_t *libvlc_get_vlc_instance( libvlc_instance_t* p_instance )
+{
+ vlc_object_hold( p_instance->p_libvlc_int ) ;
+ return (vlc_object_t*) p_instance->p_libvlc_int ;
+}
+
+void libvlc_free( void *ptr )
{
- return VLC_Changeset();
+ free( ptr );
}