* 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>
return NULL;
}
+static void libvlc_exception_not_handled( const char *psz )
+{
+ fprintf( stderr, "*** LibVLC Exception not handled: %s\nSet a breakpoint in '%s' to debug.\n",
+ psz, __func__ );
+}
+
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 ) return;
-
- /* remove previous exception if it wasn't cleared */
- libvlc_exception_clear( p_exception );
-
+ /* Unformat-ize the message */
va_start( args, psz_format );
- if( vasprintf( &p_exception->psz_message, psz_format, args ) == -1)
- p_exception->psz_message = (char *)nomemstr;
+ if( vasprintf( &psz, psz_format, args ) == -1)
+ psz = (char *)nomemstr;
va_end( args );
+ /* 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 */
+ libvlc_exception_not_handled( psz );
+ return;
+ }
+
+ /* Make sure that there is no unoticed previous exception */
+ if( p_exception->b_raised )
+ {
+ libvlc_exception_not_handled( p_exception->psz_message );
+ libvlc_exception_clear( p_exception );
+ }
+ p_exception->psz_message = psz;
p_exception->b_raised = 1;
}
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_unlock( &p_instance->instance_lock );
}
-void libvlc_release( libvlc_instance_t *p_instance, libvlc_exception_t *p_e )
+void libvlc_release( libvlc_instance_t *p_instance )
{
vlc_mutex_t *lock = &p_instance->instance_lock;
int refs;
vlc_mutex_lock( lock );
refs = --p_instance->ref_count;
- if( refs == 0 )
- libvlc_event_fini( p_instance, p_e );
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, false );
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, false, true, 0, NULL ) )
+ 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_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()
+{
+ return VLC_Version();
+}
+
+const char * libvlc_get_compiler()
+{
+ return VLC_Compiler();
+}
+
+const char * libvlc_get_changeset()
+{
+ return VLC_Changeset();
+}