Removes trailing spaces. Removes tabs.

[vlc] / src / control / core.c

diff --git a/src/control/core.c b/src/control/core.c
index 1e8aae6bd34d201be52a6b0ddd908bda6698d81f..657edada627910e1eab988a38640654993b106dd 100644 (file)
--- a/src/control/core.c
+++ b/src/control/core.c
@@ -21,15 +21,15 @@
  * 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>
 
 /*************************************************************************
  * 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;
@@ -43,12 +43,12 @@ void libvlc_exception_clear( libvlc_exception_t *p_exception )
     p_exception->b_raised = 0;
 }
 
-inline int libvlc_exception_raised( libvlc_exception_t *p_exception )
+int libvlc_exception_raised( 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 )
+char *libvlc_exception_get_message( libvlc_exception_t *p_exception )
 {
     if( p_exception->b_raised == 1 && p_exception->psz_message )
     {
@@ -57,8 +57,8 @@ inline char* libvlc_exception_get_message( libvlc_exception_t *p_exception )
     return NULL;
 }
 
-inline void libvlc_exception_raise( libvlc_exception_t *p_exception,
-                                    const char *psz_format, ... )
+void libvlc_exception_raise( libvlc_exception_t *p_exception,
+                                           const char *psz_format, ... )
 {
     va_list args;
 
@@ -67,13 +67,11 @@ inline void libvlc_exception_raise( libvlc_exception_t *p_exception,
 
     /* 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;
-    }
 
     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 = NULL;
     va_end( args );
 
     p_exception->b_raised = 1;
@@ -91,21 +89,31 @@ libvlc_instance_t * libvlc_new( int argc, char **argv,
     if( !p_new ) RAISENULL( "Out of memory" );
 
     /** \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 ) )
         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 )