Commit 9b2c414c authored by Thomas Guillem's avatar Thomas Guillem Committed by Rémi Denis-Courmont

libvlc: don't use functions with leading underscore

Signed-off-by: default avatarRémi Denis-Courmont <remi@remlab.net>
parent 6bf8fffe
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
#include "libvlc_internal.h" #include "libvlc_internal.h"
#include "media_internal.h" // libvlc_media_new_from_input_item() #include "media_internal.h" // libvlc_media_new_from_input_item()
#include "media_list_internal.h" // _libvlc_media_list_add_media() #include "media_list_internal.h" // libvlc_media_list_internal_add_media()
struct libvlc_media_discoverer_t struct libvlc_media_discoverer_t
{ {
...@@ -87,7 +87,7 @@ static void services_discovery_item_added( const vlc_event_t * p_event, ...@@ -87,7 +87,7 @@ static void services_discovery_item_added( const vlc_event_t * p_event,
/* Insert the md into the root list */ /* Insert the md into the root list */
libvlc_media_list_lock( p_mdis->p_mlist ); libvlc_media_list_lock( p_mdis->p_mlist );
_libvlc_media_list_add_media( p_mdis->p_mlist, p_catmd ); libvlc_media_list_internal_add_media( p_mdis->p_mlist, p_catmd );
libvlc_media_list_unlock( p_mdis->p_mlist ); libvlc_media_list_unlock( p_mdis->p_mlist );
/* We don't release the mlist cause the dictionary /* We don't release the mlist cause the dictionary
...@@ -97,7 +97,7 @@ static void services_discovery_item_added( const vlc_event_t * p_event, ...@@ -97,7 +97,7 @@ static void services_discovery_item_added( const vlc_event_t * p_event,
} }
libvlc_media_list_lock( p_mlist ); libvlc_media_list_lock( p_mlist );
_libvlc_media_list_add_media( p_mlist, p_md ); libvlc_media_list_internal_add_media( p_mlist, p_md );
libvlc_media_list_unlock( p_mlist ); libvlc_media_list_unlock( p_mlist );
libvlc_media_release( p_md ); libvlc_media_release( p_md );
...@@ -121,7 +121,7 @@ static void services_discovery_item_removed( const vlc_event_t * p_event, ...@@ -121,7 +121,7 @@ static void services_discovery_item_removed( const vlc_event_t * p_event,
p_md = libvlc_media_list_item_at_index( p_mdis->p_mlist, i ); p_md = libvlc_media_list_item_at_index( p_mdis->p_mlist, i );
if( p_md->p_input_item == p_item ) if( p_md->p_input_item == p_item )
{ {
_libvlc_media_list_remove_index( p_mdis->p_mlist, i ); libvlc_media_list_internal_remove_index( p_mdis->p_mlist, i );
break; break;
} }
} }
...@@ -140,7 +140,7 @@ static void services_discovery_removeall( const vlc_event_t * p_event, ...@@ -140,7 +140,7 @@ static void services_discovery_removeall( const vlc_event_t * p_event,
libvlc_media_list_lock( p_mdis->p_mlist ); libvlc_media_list_lock( p_mdis->p_mlist );
for( int i = 0; i < libvlc_media_list_count( p_mdis->p_mlist ); i++ ) for( int i = 0; i < libvlc_media_list_count( p_mdis->p_mlist ); i++ )
{ {
_libvlc_media_list_remove_index( p_mdis->p_mlist, i ); libvlc_media_list_internal_remove_index( p_mdis->p_mlist, i );
} }
libvlc_media_list_unlock( p_mdis->p_mlist ); libvlc_media_list_unlock( p_mdis->p_mlist );
} }
......
...@@ -334,12 +334,12 @@ int libvlc_media_list_add_media( libvlc_media_list_t * p_mlist, ...@@ -334,12 +334,12 @@ int libvlc_media_list_add_media( libvlc_media_list_t * p_mlist,
{ {
if( !mlist_is_writable(p_mlist) ) if( !mlist_is_writable(p_mlist) )
return -1; return -1;
_libvlc_media_list_add_media( p_mlist, p_md ); libvlc_media_list_internal_add_media( p_mlist, p_md );
return 0; return 0;
} }
/* LibVLC internal version */ /* LibVLC internal version */
void _libvlc_media_list_add_media( libvlc_media_list_t * p_mlist, void libvlc_media_list_internal_add_media( libvlc_media_list_t * p_mlist,
libvlc_media_t * p_md ) libvlc_media_t * p_md )
{ {
libvlc_media_retain( p_md ); libvlc_media_retain( p_md );
...@@ -362,13 +362,12 @@ int libvlc_media_list_insert_media( libvlc_media_list_t * p_mlist, ...@@ -362,13 +362,12 @@ int libvlc_media_list_insert_media( libvlc_media_list_t * p_mlist,
{ {
if( !mlist_is_writable(p_mlist) ) if( !mlist_is_writable(p_mlist) )
return -1; return -1;
_libvlc_media_list_insert_media( p_mlist, p_md, index ); libvlc_media_list_internal_insert_media( p_mlist, p_md, index );
return 0; return 0;
} }
/* LibVLC internal version */ /* LibVLC internal version */
void _libvlc_media_list_insert_media( void libvlc_media_list_internal_insert_media( libvlc_media_list_t * p_mlist,
libvlc_media_list_t * p_mlist,
libvlc_media_t * p_md, libvlc_media_t * p_md,
int index ) int index )
{ {
...@@ -389,11 +388,11 @@ int libvlc_media_list_remove_index( libvlc_media_list_t * p_mlist, ...@@ -389,11 +388,11 @@ int libvlc_media_list_remove_index( libvlc_media_list_t * p_mlist,
{ {
if( !mlist_is_writable(p_mlist) ) if( !mlist_is_writable(p_mlist) )
return -1; return -1;
return _libvlc_media_list_remove_index( p_mlist, index ); return libvlc_media_list_internal_remove_index( p_mlist, index );
} }
/* LibVLC internal version */ /* LibVLC internal version */
int _libvlc_media_list_remove_index( libvlc_media_list_t * p_mlist, int libvlc_media_list_internal_remove_index( libvlc_media_list_t * p_mlist,
int index ) int index )
{ {
libvlc_media_t * p_md; libvlc_media_t * p_md;
......
...@@ -52,15 +52,15 @@ struct libvlc_media_list_t ...@@ -52,15 +52,15 @@ struct libvlc_media_list_t
}; };
/* Media List */ /* Media List */
void _libvlc_media_list_add_media( void libvlc_media_list_internal_add_media(
libvlc_media_list_t * p_mlist, libvlc_media_list_t * p_mlist,
libvlc_media_t * p_md ); libvlc_media_t * p_md );
void _libvlc_media_list_insert_media( void libvlc_media_list_internal_insert_media(
libvlc_media_list_t * p_mlist, libvlc_media_list_t * p_mlist,
libvlc_media_t * p_md, int index ); libvlc_media_t * p_md, int index );
int _libvlc_media_list_remove_index( int libvlc_media_list_internal_remove_index(
libvlc_media_list_t * p_mlist, int index ); libvlc_media_list_t * p_mlist, int index );
#endif #endif
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