X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fcontrol%2Fcore.c;h=986c37704a8cc4f136476ad502736ef99bee7e9d;hb=a537329058d5700fe37344fa36c24e02bb89f289;hp=e21dc97d00e28c37fb4e6d6f519f5203564737ad;hpb=77806e29067877041d1ffba0d1ce1e9db94e6f9a;p=vlc

diff --git a/src/control/core.c b/src/control/core.c
index e21dc97d00..986c37704a 100644
--- a/src/control/core.c
+++ b/src/control/core.c
@@ -21,6 +21,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include "libvlc_internal.h"
 #include <vlc/libvlc.h>
 
@@ -39,17 +43,14 @@ static const char nomemstr[] = "Insufficient memory";
 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( NULL == p_exception )
         return;
-    if( p_exception->psz_message != nomemstr )
-        free( p_exception->psz_message );
-    p_exception->psz_message = NULL;
     p_exception->b_raised = 0;
+    libvlc_clearerr ();
 }
 
 int libvlc_exception_raised( const libvlc_exception_t *p_exception )
@@ -57,16 +58,6 @@ int libvlc_exception_raised( const libvlc_exception_t *p_exception )
     return (NULL != p_exception) && p_exception->b_raised;
 }
 
-const char *
-libvlc_exception_get_message( const libvlc_exception_t *p_exception )
-{
-    if( p_exception->b_raised == 1 && p_exception->psz_message )
-    {
-        return p_exception->psz_message;
-    }
-    return NULL;
-}
-
 static void libvlc_exception_not_handled( const char *psz )
 {
     fprintf( stderr, "*** LibVLC Exception not handled: %s\nSet a breakpoint in '%s' to debug.\n",
@@ -74,35 +65,16 @@ static void libvlc_exception_not_handled( const char *psz )
     abort();
 }
 
-void libvlc_exception_raise( libvlc_exception_t *p_exception,
-                             const char *psz_format, ... )
+void libvlc_exception_raise( libvlc_exception_t *p_exception )
 {
-    va_list args;
-    char * psz;
-
-    /* Unformat-ize the message */
-    va_start( args, psz_format );
-    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 that lazy third-parties can easily
          * notice that something may have gone unnoticedly wrong */
-        libvlc_exception_not_handled( psz );
-        if( psz != nomemstr )
-            free( psz );
+        libvlc_exception_not_handled( libvlc_errmsg() );
         return;
     }
 
-    /* Make sure that there is no unnoticed 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;
 }
 
@@ -111,11 +83,22 @@ libvlc_instance_t * libvlc_new( int argc, const char *const *argv,
 {
     libvlc_instance_t *p_new;
     int i_ret;
+
+    libvlc_init_threads ();
+
     libvlc_int_t *p_libvlc_int = libvlc_InternalCreate();
-    if( !p_libvlc_int ) RAISENULL( "VLC initialization failed" );
+    if( !p_libvlc_int )
+    {
+        libvlc_deinit_threads ();
+        RAISENULL( "VLC initialization failed" );
+    }
 
     p_new = malloc( sizeof( libvlc_instance_t ) );
-    if( !p_new ) RAISENULL( "Out of memory" );
+    if( !p_new )
+    {
+        libvlc_deinit_threads ();
+        RAISENULL( "Out of memory" );
+    }
 
     const char *my_argv[argc + 2];
 
@@ -132,6 +115,8 @@ libvlc_instance_t * libvlc_new( int argc, const char *const *argv,
     {
         libvlc_InternalDestroy( p_libvlc_int );
         free( p_new );
+        libvlc_deinit_threads ();
+
         if( i_ret == VLC_EEXITSUCCESS )
             return NULL;
         else
@@ -142,12 +127,10 @@ libvlc_instance_t * libvlc_new( int argc, const char *const *argv,
     p_new->libvlc_vlm.p_vlm = NULL;
     p_new->libvlc_vlm.p_event_manager = NULL;
     p_new->libvlc_vlm.pf_release = NULL;
-    p_new->b_playlist_locked = 0;
     p_new->ref_count = 1;
     p_new->verbosity = 1;
     p_new->p_callback_list = NULL;
     vlc_mutex_init(&p_new->instance_lock);
-    vlc_mutex_init(&p_new->event_callback_lock);
 
     return p_new;
 }
@@ -175,12 +158,12 @@ void libvlc_release( libvlc_instance_t *p_instance )
     if( refs == 0 )
     {
         vlc_mutex_destroy( lock );
-        vlc_mutex_destroy( &p_instance->event_callback_lock );
         if( p_instance->libvlc_vlm.pf_release )
             p_instance->libvlc_vlm.pf_release( p_instance );
         libvlc_InternalCleanup( p_instance->p_libvlc_int );
         libvlc_InternalDestroy( p_instance->p_libvlc_int );
         free( p_instance );
+        libvlc_deinit_threads ();
     }
 }
 
@@ -189,9 +172,11 @@ int libvlc_add_intf( libvlc_instance_t *p_i, const char *name,
 {
     if( libvlc_InternalAddIntf( p_i->p_libvlc_int, name ) )
     {
-        libvlc_exception_raise( p_e, "Interface initialization failed" );
+        libvlc_printerr("Interface initialization failed");
+        libvlc_exception_raise( p_e );
         return -1;
     }
+    return 0;
 }
 
 void libvlc_wait( libvlc_instance_t *p_i )