A bit of cleanup and test

[vlc] / include / libvlc_internal.h

diff --git a/include/libvlc_internal.h b/include/libvlc_internal.h
index 634d7f0d01c406a0b6f11bf4d0aa757df3b49144..da05bfa2e648119bc11d454e439f326dd40ec4ab 100644 (file)
--- a/include/libvlc_internal.h
+++ b/include/libvlc_internal.h
@@ -31,12 +31,25 @@ extern "C" {
 
 #include <vlc/vlc.h>
 
+/***************************************************************************
+ * Internal creation and destruction functions
+ ***************************************************************************/
+libvlc_int_t *libvlc_InternalCreate();
+int libvlc_InternalInit( libvlc_int_t *, int, char *ppsz_argv[] );
+int libvlc_InternalCleanup( libvlc_int_t * );
+int libvlc_InternalDestroy( libvlc_int_t *, vlc_bool_t );
+
+int libvlc_InternalAddIntf( libvlc_int_t *, char const *, vlc_bool_t,
+                            vlc_bool_t, int, char ** );
+
+/***************************************************************************
+ * Opaque structures for libvlc API
+ ***************************************************************************/
+
 struct libvlc_instance_t
 {
     libvlc_int_t *p_libvlc_int;
-    playlist_t *p_playlist;
     vlm_t      *p_vlm;
-    int    i_vlc_id;
 };
 
 struct libvlc_input_t
@@ -46,9 +59,12 @@ struct libvlc_input_t
     struct libvlc_instance_t *p_instance; ///< Parent instance
 };
 
-#define RAISENULL( psz ) { libvlc_exception_raise( p_e, psz ); return NULL; }
-#define RAISEVOID( psz ) { libvlc_exception_raise( p_e, psz ); return; }
-#define RAISEZERO( psz ) { libvlc_exception_raise( p_e, psz ); return 0; }
+#define RAISENULL( psz,a... ) { libvlc_exception_raise( p_e, psz,##a ); \
+                                return NULL; }
+#define RAISEVOID( psz,a... ) { libvlc_exception_raise( p_e, psz,##a ); \
+                                return; }
+#define RAISEZERO( psz,a... ) { libvlc_exception_raise( p_e, psz,##a ); \
+                                return 0; }
 
 # ifdef __cplusplus
 }