Libvlc Event: Add support for input event.

[vlc] / src / control / core.c

diff --git a/src/control/core.c b/src/control/core.c
index ddfa6adc5e3f7b01000b94b94b3c20a360b66111..cfbc2b06a284dfbf768f8245a9889b6120b68d11 100644 (file)
--- a/src/control/core.c
+++ b/src/control/core.c
@@ -21,10 +21,10 @@
  * 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
@@ -45,7 +45,7 @@ void libvlc_exception_clear( libvlc_exception_t *p_exception )
 
 inline 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 )
@@ -58,7 +58,7 @@ inline char* libvlc_exception_get_message( libvlc_exception_t *p_exception )
 }
 
 inline void libvlc_exception_raise( libvlc_exception_t *p_exception,
-                                    char *psz_format, ... )
+                                    const char *psz_format, ... )
 {
     va_list args;
 
@@ -83,8 +83,6 @@ libvlc_instance_t * libvlc_new( int argc, char **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" );
@@ -95,19 +93,29 @@ 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 */    
 
-    if( libvlc_InternalInit( p_libvlc_int, argc, ppsz_argv ) )
+    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 )