[vlc-devel] [PATCH 05/12] libvlc: don't use functions with leading underscore

[Thomas Guillem]

---
 lib/media_discoverer.c    | 10 +++++-----
 lib/media_list.c          | 21 ++++++++++-----------
 lib/media_list_internal.h |  6 +++---
 3 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/lib/media_discoverer.c b/lib/media_discoverer.c
index a2532cb..c914e3a 100644
--- a/lib/media_discoverer.c
+++ b/lib/media_discoverer.c
@@ -37,7 +37,7 @@
 
 #include "libvlc_internal.h"
 #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
 {
@@ -87,7 +87,7 @@ static void services_discovery_item_added( const vlc_event_t * p_event,
 
             /* Insert the md into the root list */
             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 );
 
             /* 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,
     }
 
     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_release( p_md );
@@ -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 );
         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;
         }
     }
@@ -140,7 +140,7 @@ static void services_discovery_removeall( const vlc_event_t * p_event,
     libvlc_media_list_lock( p_mdis->p_mlist );
     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 );
 }
diff --git a/lib/media_list.c b/lib/media_list.c
index 39bc354..dff4edb 100644
--- a/lib/media_list.c
+++ b/lib/media_list.c
@@ -334,13 +334,13 @@ int libvlc_media_list_add_media( libvlc_media_list_t * p_mlist,
 {
     if( !mlist_is_writable(p_mlist) )
         return -1;
-    _libvlc_media_list_add_media( p_mlist, p_md );
+    libvlc_media_list_internal_add_media( p_mlist, p_md );
     return 0;
 }
 
 /* LibVLC internal version */
-void _libvlc_media_list_add_media( libvlc_media_list_t * p_mlist,
-                                   libvlc_media_t * p_md )
+void libvlc_media_list_internal_add_media( libvlc_media_list_t * p_mlist,
+                                           libvlc_media_t * p_md )
 {
     libvlc_media_retain( p_md );
 
@@ -362,15 +362,14 @@ int libvlc_media_list_insert_media( libvlc_media_list_t * p_mlist,
 {
     if( !mlist_is_writable(p_mlist) )
         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;
 }
 
 /* LibVLC internal version */
-void _libvlc_media_list_insert_media(
-                                   libvlc_media_list_t * p_mlist,
-                                   libvlc_media_t * p_md,
-                                   int index )
+void libvlc_media_list_internal_insert_media( libvlc_media_list_t * p_mlist,
+                                              libvlc_media_t * p_md,
+                                              int index )
 {
     libvlc_media_retain( p_md );
 
@@ -389,12 +388,12 @@ int libvlc_media_list_remove_index( libvlc_media_list_t * p_mlist,
 {
     if( !mlist_is_writable(p_mlist) )
         return -1;
-    return _libvlc_media_list_remove_index( p_mlist, index );
+    return libvlc_media_list_internal_remove_index( p_mlist, index );
 }
 
 /* LibVLC internal version */
-int _libvlc_media_list_remove_index( libvlc_media_list_t * p_mlist,
-                                     int index )
+int libvlc_media_list_internal_remove_index( libvlc_media_list_t * p_mlist,
+                                             int index )
 {
     libvlc_media_t * p_md;
 
diff --git a/lib/media_list_internal.h b/lib/media_list_internal.h
index 8df6579..9c2412b 100644
--- a/lib/media_list_internal.h
+++ b/lib/media_list_internal.h
@@ -52,15 +52,15 @@ struct libvlc_media_list_t
 };
 
 /* Media List */
-void _libvlc_media_list_add_media(
+void libvlc_media_list_internal_add_media(
         libvlc_media_list_t * p_mlist,
         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_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 );
 
 #endif
-- 
2.1.3