control/core.c: Fix a warning about lock being an usunsed variable, by using lock.

[vlc] / src / control / core.c

diff --git a/src/control/core.c b/src/control/core.c
index 6c189ce86b412507bcf27c15863b8d5f13d9623a..69f94bdd6d45cc790d5ec9330dfb0ecf216f1184 100644 (file)
--- a/src/control/core.c
+++ b/src/control/core.c
@@ -20,12 +20,17 @@
  * 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
  *************************************************************************/
@@ -37,18 +42,19 @@ void libvlc_exception_init( libvlc_exception_t *p_exception )
 
 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;
 }
 
-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;
 }
 
-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 )
     {
@@ -66,18 +72,17 @@ void libvlc_exception_raise( libvlc_exception_t *p_exception,
     if( p_exception == NULL ) return;
 
     /* remove previous exception if it wasn't cleared */
-    if( p_exception->b_raised && p_exception->psz_message )
-        free(p_exception->psz_message);
+    libvlc_exception_clear( p_exception );
 
     va_start( args, psz_format );
     if( vasprintf( &p_exception->psz_message, psz_format, args ) == -1)
-        p_exception->psz_message = NULL;
+        p_exception->psz_message = (char *)nomemstr;
     va_end( args );
 
     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;
@@ -88,32 +93,63 @@ libvlc_instance_t * libvlc_new( int argc, char **argv,
     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_libvlc_int, &p_new->event_callback_lock);
-    
+ 
     libvlc_event_init(p_new, p_e);
 
     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 )