Removes trailing spaces. Removes tabs.

[vlc] / src / control / core.c

diff --git a/src/control/core.c b/src/control/core.c
index 6675f81219a3352c5abd70030c21cbd9b2b00ead..657edada627910e1eab988a38640654993b106dd 100644 (file)
--- a/src/control/core.c
+++ b/src/control/core.c
@@ -4,7 +4,7 @@
  * Copyright (C) 2005 the VideoLAN team
  * $Id$
  *
- * Authors: Cl�ent Stenac <zorglub@videolan.org>
+ * Authors: Clément Stenac <zorglub@videolan.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -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,
-                                    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;
@@ -82,13 +80,9 @@ inline void libvlc_exception_raise( libvlc_exception_t *p_exception,
 libvlc_instance_t * libvlc_new( int argc, char **argv,
                                 libvlc_exception_t *p_e )
 {
-    int i_vlc_id;
     libvlc_instance_t *p_new;
-    libvlc_int_t *p_libvlc_int;
-
-    i_vlc_id = VLC_Create();
-    p_libvlc_int = (libvlc_int_t* ) vlc_current_object( i_vlc_id );
 
+    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 ) );
@@ -97,30 +91,32 @@ libvlc_instance_t * libvlc_new( int argc, char **argv,
     /** \todo Look for interface settings. If we don't have any, add -I dummy */
     /* Because we probably don't want a GUI by default */
 
-
-    VLC_Init( i_vlc_id, argc, argv );
+    if( libvlc_InternalInit( p_libvlc_int, argc, argv ) )
+        RAISENULL( "VLC initialization failed" );
 
     p_new->p_libvlc_int = p_libvlc_int;
-    p_new->p_playlist = (playlist_t *)vlc_object_find( p_new->p_libvlc_int,
-                                VLC_OBJECT_PLAYLIST, FIND_CHILD );
     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);
 
-    if( !p_new->p_playlist ) RAISENULL( "Playlist creation failed" );
-    
-    p_new->i_vlc_id = i_vlc_id;
     return p_new;
 }
 
-void libvlc_destroy( libvlc_instance_t *p_instance )
+void libvlc_destroy( libvlc_instance_t *p_instance, libvlc_exception_t *p_e )
 {
-    if( p_instance->p_playlist )
-        vlc_object_release( p_instance->p_playlist );
-    vlc_object_release( p_instance->p_libvlc_int );
-    VLC_CleanUp( p_instance->i_vlc_id );
-    VLC_Destroy( p_instance->i_vlc_id );
+    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 )
 {
-    return p_instance->i_vlc_id;
+    return p_instance->p_libvlc_int->i_object_id;
 }