]> git.sesse.net Git - vlc/blobdiff - src/control/libvlc_internal.h
Fix preferences for jack (avoid the double 'pace' text)
[vlc] / src / control / libvlc_internal.h
index fe2f0e548464dedf385297346957a7d3f497c31d..a291858b20877e78c6e8d43e7666e42e60548151 100644 (file)
 #include <vlc/vlc.h>
 #include <vlc/libvlc_structures.h>
 
+#include <vlc_common.h>
 #include <vlc_arrays.h>
 #include <vlc_input.h>
 
-# ifdef __cplusplus
-extern "C" {
-# endif
-
 /***************************************************************************
  * Internal creation and destruction functions
  ***************************************************************************/
 VLC_EXPORT (libvlc_int_t *, libvlc_InternalCreate, ( void ) );
 VLC_EXPORT (int, libvlc_InternalInit, ( libvlc_int_t *, int, const char *ppsz_argv[] ) );
 VLC_EXPORT (int, libvlc_InternalCleanup, ( libvlc_int_t * ) );
-VLC_EXPORT (int, libvlc_InternalDestroy, ( libvlc_int_t *, bool ) );
-
-VLC_EXPORT (int, libvlc_InternalAddIntf, ( libvlc_int_t *, const char *, bool,
-                            bool, int, const char *const * ) );
-
-VLC_EXPORT (void, libvlc_event_init, ( libvlc_instance_t *, libvlc_exception_t * ) );
-VLC_EXPORT (void, libvlc_event_fini, ( libvlc_instance_t * ) );
+VLC_EXPORT (int, libvlc_InternalDestroy, ( libvlc_int_t * ) );
 
+VLC_EXPORT (int, libvlc_InternalAddIntf, ( libvlc_int_t *, const char * ) );
 
 /***************************************************************************
  * Opaque structures for libvlc API
@@ -261,77 +253,91 @@ typedef struct libvlc_event_manager_t
 /***************************************************************************
  * Other internal functions
  ***************************************************************************/
-VLC_EXPORT (input_thread_t *, libvlc_get_input_thread,
-                        ( struct libvlc_media_player_t *, libvlc_exception_t * ) );
+input_thread_t *libvlc_get_input_thread(
+     libvlc_media_player_t *,
+    libvlc_exception_t * );
 
 /* Media instance */
-VLC_EXPORT (libvlc_media_player_t *, libvlc_media_player_new_from_input_thread,
-                        ( struct libvlc_instance_t *, input_thread_t *, libvlc_exception_t * ) );
+libvlc_media_player_t *
+libvlc_media_player_new_from_input_thread( libvlc_instance_t *,
+                                           input_thread_t *,
+                                           libvlc_exception_t * );
 
-VLC_EXPORT (void, libvlc_media_player_destroy,
-                        ( libvlc_media_player_t * ) );
+void libvlc_media_player_destroy(
+        libvlc_media_player_t * );
 
 /* Media Descriptor */
-VLC_EXPORT (libvlc_media_t *, libvlc_media_new_from_input_item,
-                        ( struct libvlc_instance_t *, input_item_t *, libvlc_exception_t * ) );
+libvlc_media_t * libvlc_media_new_from_input_item(
+        libvlc_instance_t *, input_item_t *,
+        libvlc_exception_t * );
 
-VLC_EXPORT (void, libvlc_media_set_state,
-                        ( libvlc_media_t *, libvlc_state_t, libvlc_exception_t * ) );
+void libvlc_media_set_state(
+        libvlc_media_t *, libvlc_state_t,
+        libvlc_exception_t * );
 
 /* Media List */
-VLC_EXPORT ( void, _libvlc_media_list_add_media,
-                        ( libvlc_media_list_t * p_mlist,
-                          libvlc_media_t * p_md,
-                          libvlc_exception_t * p_e ) );
-
-VLC_EXPORT ( void, _libvlc_media_list_insert_media,
-                        ( libvlc_media_list_t * p_mlist,
-                          libvlc_media_t * p_md,
-                          int index,
-                          libvlc_exception_t * p_e ) );
-
-VLC_EXPORT ( void, _libvlc_media_list_remove_index,
-                        ( libvlc_media_list_t * p_mlist,
-                          int index,
-                          libvlc_exception_t * p_e ) );
+void _libvlc_media_list_add_media(
+        libvlc_media_list_t * p_mlist,
+        libvlc_media_t * p_md,
+        libvlc_exception_t * p_e );
+
+void _libvlc_media_list_insert_media(
+        libvlc_media_list_t * p_mlist,
+        libvlc_media_t * p_md, int index,
+        libvlc_exception_t * p_e );
+
+void _libvlc_media_list_remove_index(
+        libvlc_media_list_t * p_mlist, int index,
+        libvlc_exception_t * p_e );
 
 /* Media List View */
-VLC_EXPORT ( libvlc_media_list_view_t *, libvlc_media_list_view_new,
-                          ( libvlc_media_list_t * p_mlist,
-                            libvlc_media_list_view_count_func_t pf_count,
-                            libvlc_media_list_view_item_at_index_func_t pf_item_at_index,
-                            libvlc_media_list_view_children_at_index_func_t pf_children_at_index,
-                            libvlc_media_list_view_constructor_func_t pf_constructor,
-                            libvlc_media_list_view_release_func_t pf_release,
-                            void * this_view_data,
-                            libvlc_exception_t * p_e ) );
-
-VLC_EXPORT ( void, libvlc_media_list_view_set_ml_notification_callback, (
-                libvlc_media_list_view_t * p_mlv,
-                void (*item_added)(const libvlc_event_t *, libvlc_media_list_view_t *),
-                void (*item_removed)(const libvlc_event_t *, libvlc_media_list_view_t *) ));
-
-VLC_EXPORT ( void, libvlc_media_list_view_will_delete_item, ( libvlc_media_list_view_t * p_mlv,
-                                                              libvlc_media_t * p_item,
-                                                              int index ));
-VLC_EXPORT ( void, libvlc_media_list_view_item_deleted, ( libvlc_media_list_view_t * p_mlv,
-                                                          libvlc_media_t * p_item,
-                                                          int index ));
-VLC_EXPORT ( void, libvlc_media_list_view_will_add_item, ( libvlc_media_list_view_t * p_mlv,
-                                                           libvlc_media_t * p_item,
-                                                           int index ));
-VLC_EXPORT ( void, libvlc_media_list_view_item_added, ( libvlc_media_list_view_t * p_mlv,
-                                                        libvlc_media_t * p_item,
-                                                        int index ));
+libvlc_media_list_view_t * libvlc_media_list_view_new(
+        libvlc_media_list_t * p_mlist,
+        libvlc_media_list_view_count_func_t pf_count,
+        libvlc_media_list_view_item_at_index_func_t pf_item_at_index,
+        libvlc_media_list_view_children_at_index_func_t pf_children_at_index,
+        libvlc_media_list_view_constructor_func_t pf_constructor,
+        libvlc_media_list_view_release_func_t pf_release,
+        void * this_view_data,
+        libvlc_exception_t * p_e );
+
+void libvlc_media_list_view_set_ml_notification_callback(
+        libvlc_media_list_view_t * p_mlv,
+        void (*item_added)(const libvlc_event_t *, libvlc_media_list_view_t *),
+        void (*item_removed)(const libvlc_event_t *, libvlc_media_list_view_t *) );
+
+void libvlc_media_list_view_will_delete_item(
+        libvlc_media_list_view_t * p_mlv,
+        libvlc_media_t * p_item, int index );
+
+void libvlc_media_list_view_item_deleted(
+        libvlc_media_list_view_t * p_mlv,
+        libvlc_media_t * p_item, int index );
+
+void libvlc_media_list_view_will_add_item (
+        libvlc_media_list_view_t * p_mlv,
+        libvlc_media_t * p_item, int index );
+
+void libvlc_media_list_view_item_added(
+        libvlc_media_list_view_t * p_mlv,
+        libvlc_media_t * p_item, int index );
 
 /* Events */
-VLC_EXPORT (libvlc_event_manager_t *, libvlc_event_manager_new, ( void * p_obj, libvlc_instance_t * p_libvlc_inst, libvlc_exception_t *p_e ) );
+libvlc_event_manager_t * libvlc_event_manager_new(
+        void * p_obj, libvlc_instance_t * p_libvlc_inst,
+        libvlc_exception_t *p_e );
 
-VLC_EXPORT (void, libvlc_event_manager_release, ( libvlc_event_manager_t * p_em ) );
+void libvlc_event_manager_release(
+        libvlc_event_manager_t * p_em );
 
-VLC_EXPORT (void, libvlc_event_manager_register_event_type, ( libvlc_event_manager_t * p_em, libvlc_event_type_t event_type, libvlc_exception_t * p_e ) );
+void libvlc_event_manager_register_event_type(
+        libvlc_event_manager_t * p_em,
+        libvlc_event_type_t event_type,
+        libvlc_exception_t * p_e );
 
-VLC_EXPORT (void, libvlc_event_send, ( libvlc_event_manager_t * p_em, libvlc_event_t * p_event ) );
+void libvlc_event_send(
+        libvlc_event_manager_t * p_em,
+        libvlc_event_t * p_event );
 
 
 /* Exception shorcuts */
@@ -343,8 +349,4 @@ VLC_EXPORT (void, libvlc_event_send, ( libvlc_event_manager_t * p_em, libvlc_eve
 #define RAISEZERO( psz,a... ) { libvlc_exception_raise( p_e, psz,##a ); \
                                 return 0; }
 
-# ifdef __cplusplus
-}
-# endif
-
 #endif