Skip to content

V
vlc-1.1
Commit 5a3ede13 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

VLC_EXPORT is meant for libvlccore, not libvlc-control

parent 966cd094
Show whitespace changes
Inline Side-by-side
Showing with 51 additions and 49 deletions
src/control/libvlc_internal.h
View file @ 5a3ede13
...@@ -50,8 +50,8 @@ VLC_EXPORT (int, libvlc_InternalDestroy, ( libvlc_int_t *, bool ) ); ...@@ -50,8 +50,8 @@ VLC_EXPORT (int, libvlc_InternalDestroy, ( libvlc_int_t *, bool ) );
VLC_EXPORT (int, libvlc_InternalAddIntf, ( libvlc_int_t *, const char *, bool, VLC_EXPORT (int, libvlc_InternalAddIntf, ( libvlc_int_t *, const char *, bool,
bool, int, const char *const * ) ); bool, int, const char *const * ) );
VLC_EXPORT (void, libvlc_event_init, ( libvlc_instance_t *, libvlc_exception_t * ) ); void libvlc_event_init( libvlc_instance_t *, libvlc_exception_t * );
VLC_EXPORT (void, libvlc_event_fini, ( libvlc_instance_t * ) ); void libvlc_event_fini( libvlc_instance_t * );
/*************************************************************************** /***************************************************************************
...@@ -261,77 +261,79 @@ typedef struct libvlc_event_manager_t ...@@ -261,77 +261,79 @@ typedef struct libvlc_event_manager_t
/*************************************************************************** /***************************************************************************
* Other internal functions * Other internal functions
***************************************************************************/ ***************************************************************************/
VLC_EXPORT (input_thread_t *, libvlc_get_input_thread, input_thread_t *libvlc_get_input_thread( struct libvlc_media_player_t *,
( struct libvlc_media_player_t *, libvlc_exception_t * ) ); libvlc_exception_t * );
/* Media instance */ /* Media instance */
VLC_EXPORT (libvlc_media_player_t *, libvlc_media_player_new_from_input_thread, libvlc_media_player_t *
( struct libvlc_instance_t *, input_thread_t *, libvlc_exception_t * ) ); libvlc_media_player_new_from_input_thread( struct libvlc_instance_t *,
input_thread_t *,
libvlc_exception_t * );
VLC_EXPORT (void, libvlc_media_player_destroy, void libvlc_media_player_destroy( libvlc_media_player_t * );
( libvlc_media_player_t * ) );
/* Media Descriptor */ /* Media Descriptor */
VLC_EXPORT (libvlc_media_t *, libvlc_media_new_from_input_item, libvlc_media_t *
( struct libvlc_instance_t *, input_item_t *, libvlc_exception_t * ) ); libvlc_media_new_from_input_item( struct libvlc_instance_t *, input_item_t *,
libvlc_exception_t * );
VLC_EXPORT (void, libvlc_media_set_state, void libvlc_media_set_state( libvlc_media_t *, libvlc_state_t,
( libvlc_media_t *, libvlc_state_t, libvlc_exception_t * ) ); libvlc_exception_t * );
/* Media List */ /* Media List */
VLC_EXPORT ( void, _libvlc_media_list_add_media, void _libvlc_media_list_add_media( libvlc_media_list_t * p_mlist,
( libvlc_media_list_t * p_mlist,
libvlc_media_t * p_md, libvlc_media_t * p_md,
libvlc_exception_t * p_e ) ); libvlc_exception_t * p_e );
VLC_EXPORT ( void, _libvlc_media_list_insert_media, void
( libvlc_media_list_t * p_mlist, _libvlc_media_list_insert_media( libvlc_media_list_t * p_mlist,
libvlc_media_t * p_md, libvlc_media_t * p_md, int index,
int index, libvlc_exception_t * p_e );
libvlc_exception_t * p_e ) );
VLC_EXPORT ( void, _libvlc_media_list_remove_index, void _libvlc_media_list_remove_index( libvlc_media_list_t * p_mlist, int index,
( libvlc_media_list_t * p_mlist, libvlc_exception_t * p_e );
int index,
libvlc_exception_t * p_e ) );
/* Media List View */ /* Media List View */
VLC_EXPORT ( libvlc_media_list_view_t *, libvlc_media_list_view_new, libvlc_media_list_view_t *
( libvlc_media_list_t * p_mlist, libvlc_media_list_view_new( libvlc_media_list_t * p_mlist,
libvlc_media_list_view_count_func_t pf_count, 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_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_children_at_index_func_t pf_children_at_index,
libvlc_media_list_view_constructor_func_t pf_constructor, libvlc_media_list_view_constructor_func_t pf_constructor,
libvlc_media_list_view_release_func_t pf_release, libvlc_media_list_view_release_func_t pf_release,
void * this_view_data, void * this_view_data,
libvlc_exception_t * p_e ) ); libvlc_exception_t * p_e );
VLC_EXPORT ( void, libvlc_media_list_view_set_ml_notification_callback, ( void
libvlc_media_list_view_set_ml_notification_callback(
libvlc_media_list_view_t * p_mlv, libvlc_media_list_view_t * p_mlv,
void (*item_added)(const libvlc_event_t *, libvlc_media_list_view_t *), 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 (*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, void
libvlc_media_t * p_item, libvlc_media_list_view_will_delete_item( libvlc_media_list_view_t * p_mlv,
int index )); libvlc_media_t * p_item, int index );
VLC_EXPORT ( void, libvlc_media_list_view_item_deleted, ( libvlc_media_list_view_t * p_mlv, void libvlc_media_list_view_item_deleted( libvlc_media_list_view_t * p_mlv,
libvlc_media_t * p_item, libvlc_media_t * p_item, int index );
int index )); void
VLC_EXPORT ( void, libvlc_media_list_view_will_add_item, ( libvlc_media_list_view_t * p_mlv, libvlc_media_list_view_will_add_item ( libvlc_media_list_view_t * p_mlv,
libvlc_media_t * p_item, libvlc_media_t * p_item, int index );
int index )); void libvlc_media_list_view_item_added( libvlc_media_list_view_t * p_mlv,
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_t * p_item,
int index ));
/* Events */ /* 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 */ /* Exception shorcuts */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment