* 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";
/*************************************************************************
{
libvlc_instance_t *p_new;
- for (int i = 0; i < argc; i++)
- printf ("%d: %s\n", i, argv[i]);
-
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 ) );
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( 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_libvlc_int, &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 )
{
- libvlc_event_fini( p_instance, p_e );
- vlc_mutex_destroy( &p_instance->instance_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 );
+ 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 );
+}
+
+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 )
+ {
+ 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 );
+ }
}
int libvlc_get_vlc_id( libvlc_instance_t *p_instance )