* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
-#include <stdarg.h>
+
#include "libvlc_internal.h"
#include <vlc/libvlc.h>
#include <vlc_interface.h>
+#include <stdarg.h>
+#include <limits.h>
+#include <assert.h>
+
+static const char nomemstr[] = "Insufficient memory";
+
/*************************************************************************
* Exceptions handling
*************************************************************************/
-inline void libvlc_exception_init( libvlc_exception_t *p_exception )
+void libvlc_exception_init( libvlc_exception_t *p_exception )
{
p_exception->b_raised = 0;
p_exception->psz_message = NULL;
void libvlc_exception_clear( libvlc_exception_t *p_exception )
{
- if( p_exception->psz_message )
+ if( p_exception->psz_message != nomemstr )
free( p_exception->psz_message );
p_exception->psz_message = NULL;
p_exception->b_raised = 0;
}
-inline int libvlc_exception_raised( libvlc_exception_t *p_exception )
+int libvlc_exception_raised( const libvlc_exception_t *p_exception )
{
return (NULL != p_exception) && p_exception->b_raised;
}
-inline char* libvlc_exception_get_message( libvlc_exception_t *p_exception )
+const char *
+libvlc_exception_get_message( const libvlc_exception_t *p_exception )
{
if( p_exception->b_raised == 1 && p_exception->psz_message )
{
return NULL;
}
-inline void libvlc_exception_raise( libvlc_exception_t *p_exception,
- const char *psz_format, ... )
+static void libvlc_exception_not_handled( const char *psz )
{
- va_list args;
-
- /* does caller care about exceptions ? */
- if( p_exception == NULL ) return;
+ fprintf( stderr, "*** LibVLC Exception not handled: %s\nSet a breakpoint in '%s' to debug.\n",
+ psz, __func__ );
+}
- /* remove previous exception if it wasn't cleared */
- if( p_exception->b_raised && p_exception->psz_message )
- {
- free(p_exception->psz_message);
- p_exception->psz_message = NULL;
- }
+void libvlc_exception_raise( libvlc_exception_t *p_exception,
+ const char *psz_format, ... )
+{
+ va_list args;
+ char * psz;
+ /* Unformat-ize the message */
va_start( args, psz_format );
- vasprintf( &p_exception->psz_message, psz_format, args );
+ 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;
}
-libvlc_instance_t * libvlc_new( int argc, char **argv,
+libvlc_instance_t * libvlc_new( int argc, const char *const *argv,
libvlc_exception_t *p_e )
{
libvlc_instance_t *p_new;
p_new = (libvlc_instance_t *)malloc( sizeof( libvlc_instance_t ) );
if( !p_new ) RAISENULL( "Out of memory" );
+ const char *my_argv[argc + 2];
+
+ my_argv[0] = "libvlc"; /* dummy arg0, skipped by getopt() et al */
+ for( int i = 0; i < argc; i++ )
+ my_argv[i + 1] = argv[i];
+ my_argv[argc + 1] = NULL; /* C calling conventions require a NULL */
+
/** \todo Look for interface settings. If we don't have any, add -I dummy */
- /* Because we probably don't want a GUI by default */
+ /* Because we probably don't want a GUI by default */
- if( libvlc_InternalInit( p_libvlc_int, argc, argv ) )
+ if( libvlc_InternalInit( p_libvlc_int, argc + 1, my_argv ) )
RAISENULL( "VLC initialization failed" );
p_new->p_libvlc_int = p_libvlc_int;
p_new->p_vlm = NULL;
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_new->instance_lock);
+ vlc_mutex_init(&p_new->event_callback_lock);
return p_new;
}
-void libvlc_destroy( libvlc_instance_t *p_instance, libvlc_exception_t *p_e )
+void libvlc_retain( libvlc_instance_t *p_instance )
{
- struct libvlc_callback_entry_list_t *p_listitem = p_instance->p_callback_list;
+ assert( p_instance != NULL );
+ assert( p_instance->ref_count < UINT_MAX );
+
+ vlc_mutex_lock( &p_instance->instance_lock );
+ p_instance->ref_count++;
+ vlc_mutex_unlock( &p_instance->instance_lock );
+}
- while( p_listitem )
+void libvlc_release( libvlc_instance_t *p_instance )
+{
+ vlc_mutex_t *lock = &p_instance->instance_lock;
+ int refs;
+
+ assert( p_instance->ref_count > 0 );
+
+ vlc_mutex_lock( lock );
+ refs = --p_instance->ref_count;
+ vlc_mutex_unlock( lock );
+
+ if( refs == 0 )
{
- struct libvlc_callback_entry_list_t *p_nextlistitem = p_listitem->next;
- free( p_listitem );
- p_listitem = p_nextlistitem;
+ 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, false );
+ free( p_instance );
}
-
- libvlc_InternalCleanup( p_instance->p_libvlc_int );
- libvlc_InternalDestroy( p_instance->p_libvlc_int, VLC_FALSE );
+}
+
+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();
+}