* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
+
#include "libvlc_internal.h"
#include <vlc/libvlc.h>
}
void libvlc_exception_raise( libvlc_exception_t *p_exception,
- const char *psz_format, ... )
+ const char *psz_format, ... )
{
va_list args;
char * psz;
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" );
/** \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 ) )
+ i_ret=libvlc_InternalInit( p_libvlc_int, argc + 1, my_argv );
+ if( i_ret == VLC_EEXITSUCCESS )
+ return NULL;
+ else if( i_ret != 0 )
RAISENULL( "VLC initialization failed" );
p_new->p_libvlc_int = p_libvlc_int;
p_new->b_playlist_locked = 0;
p_new->ref_count = 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 );
libvlc_InternalCleanup( p_instance->p_libvlc_int );
- libvlc_InternalDestroy( p_instance->p_libvlc_int, VLC_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;
+ vlc_object_lock( p_libvlc );
+ while( vlc_object_alive( p_libvlc ) )
+ vlc_object_wait( p_libvlc );
+ vlc_object_unlock( p_libvlc );
+}
+
int libvlc_get_vlc_id( libvlc_instance_t *p_instance )
{
return p_instance->p_libvlc_int->i_object_id;
}
+
+const char * libvlc_get_version(void)
+{
+ return VLC_Version();
+}
+
+const char * libvlc_get_compiler(void)
+{
+ return VLC_Compiler();
+}
+
+const char * libvlc_get_changeset(void)
+{
+ return VLC_Changeset();
+}