Changing the order of parameters may be needed, but changing the parameters themselve...

[vlc] / src / control / core.c

diff --git a/src/control/core.c b/src/control/core.c
index dbe8b4481de752df59e4bea366705b78badb6fed..d52023597f7fec9fea98bfcd12082345a2376e5c 100644 (file)
--- a/src/control/core.c
+++ b/src/control/core.c
@@ -21,15 +21,17 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #include <stdarg.h>
-#include <libvlc_internal.h>
+#include "libvlc_internal.h"
 #include <vlc/libvlc.h>
 
-#include <vlc/intf.h>
+#include <vlc_interface.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;
@@ -37,18 +39,19 @@ inline 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;
 }
 
-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 )
     {
@@ -57,8 +60,8 @@ inline char* libvlc_exception_get_message( libvlc_exception_t *p_exception )
     return NULL;
 }
 
-inline void libvlc_exception_raise( libvlc_exception_t *p_exception,
-                                    char *psz_format, ... )
+void libvlc_exception_raise( libvlc_exception_t *p_exception,
+                                           const char *psz_format, ... )
 {
     va_list args;
 
@@ -66,25 +69,20 @@ inline 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);
-        p_exception->psz_message = NULL;
-    }
+    libvlc_exception_clear( p_exception );
 
     va_start( args, psz_format );
-    vasprintf( &p_exception->psz_message, psz_format, args );
+    if( vasprintf( &p_exception->psz_message, psz_format, args ) == -1)
+        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;
-    int i_index;
-    char** ppsz_argv = NULL;
 
     libvlc_int_t *p_libvlc_int = libvlc_InternalCreate();
     if( !p_libvlc_int ) RAISENULL( "VLC initialization failed" );
@@ -92,33 +90,39 @@ 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 */    
-
-    /* Prepend a dummy argv[0] so that users of the libvlc API do not have to 
-       do it themselves, and can simply provide the args list. */
-    ppsz_argv = malloc( ( argc + 2 ) * sizeof( char * ) ) ;
-    if( ! ppsz_argv ) 
-        RAISENULL( "Out of memory" );
-
-    ppsz_argv[0] = strdup("vlc");
-    for ( i_index = 0; i_index < argc; i_index++ )
-        ppsz_argv[i_index + 1] = argv[i_index];
-    ppsz_argv[argc + 1] = NULL;
-    
-    if( libvlc_InternalInit( p_libvlc_int, argc + 1, ppsz_argv ) )
+    /* Because we probably don't want a GUI by default */
+
+    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->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 )
 {
+    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 );
 }
 
 int libvlc_get_vlc_id( libvlc_instance_t *p_instance )