* Copyright (C) 2005 the VideoLAN team
* $Id$
*
- * Authors: Cl�ent Stenac <zorglub@videolan.org>
+ * Authors: Clément Stenac <zorglub@videolan.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* 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 "libvlc_internal.h"
#include <vlc/libvlc.h>
-#include <vlc/intf.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 p_exception->b_raised;
+ 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,
- char *psz_message )
+void libvlc_exception_raise( libvlc_exception_t *p_exception,
+ const char *psz_format, ... )
{
+ va_list args;
+
+ /* does caller care about exceptions ? */
if( p_exception == NULL ) return;
+
+ /* remove previous exception if it wasn't cleared */
+ libvlc_exception_clear( p_exception );
+
+ va_start( args, psz_format );
+ if( vasprintf( &p_exception->psz_message, psz_format, args ) == -1)
+ p_exception->psz_message = (char *)nomemstr;
+ va_end( args );
+
p_exception->b_raised = 1;
- if( psz_message )
- p_exception->psz_message = strdup( psz_message );
}
-libvlc_instance_t * libvlc_new( int argc, char **argv,
- libvlc_exception_t *p_exception )
+libvlc_instance_t * libvlc_new( int argc, const char *const *argv,
+ libvlc_exception_t *p_e )
{
- int i_vlc_id;
libvlc_instance_t *p_new;
- vlc_t *p_vlc;
- i_vlc_id = VLC_Create();
- p_vlc = (vlc_t* ) vlc_current_object( i_vlc_id );
+ libvlc_int_t *p_libvlc_int = libvlc_InternalCreate();
+ if( !p_libvlc_int ) RAISENULL( "VLC initialization failed" );
- if( !p_vlc )
- {
- libvlc_exception_raise( p_exception, "VLC initialization failed" );
- return NULL;
- }
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 */
- if( !p_new )
- {
- libvlc_exception_raise( p_exception, "Out of memory" );
- return NULL;
- }
+ if( libvlc_InternalInit( p_libvlc_int, argc + 1, my_argv ) )
+ RAISENULL( "VLC initialization failed" );
- VLC_Init( i_vlc_id, argc, argv );
+ 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_libvlc_int, &p_new->event_callback_lock);
+
+ libvlc_event_init(p_new, p_e);
- p_new->p_vlc = p_vlc;
- p_new->p_playlist = (playlist_t *)vlc_object_find( p_new->p_vlc,
- VLC_OBJECT_PLAYLIST, FIND_CHILD );
+ return p_new;
+}
+
+void libvlc_retain( libvlc_instance_t *p_instance )
+{
+ 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 );
+}
- if( !p_new->p_playlist )
+void libvlc_release( libvlc_instance_t *p_instance, libvlc_exception_t *p_e )
+{
+ 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;
+ if( refs == 0 )
+ libvlc_event_fini( p_instance, p_e );
+ vlc_mutex_unlock( lock );
+
+ if( refs == 0 )
{
- libvlc_exception_raise( p_exception, "Playlist creation failed" );
- return NULL;
+ 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 );
+ free( p_instance );
}
- p_new->i_vlc_id = i_vlc_id;
-
- return p_new;
}
-void libvlc_destroy( libvlc_instance_t *p_instance )
+int libvlc_get_vlc_id( libvlc_instance_t *p_instance )
{
- if( p_instance->p_playlist )
- vlc_object_release( p_instance->p_playlist );
- vlc_object_release( p_instance->p_vlc );
- VLC_CleanUp( p_instance->i_vlc_id );
- VLC_Destroy( p_instance->i_vlc_id );
+ return p_instance->p_libvlc_int->i_object_id;
}
projects / vlc / blobdiff