[vlc-devel] commit: Revert "sd: Export internals with a getters." ( Rémi Denis-Courmont )

git version control git at videolan.org
Wed Feb 24 16:56:46 CET 2010


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Wed Feb 24 17:54:49 2010 +0200| [350b1052769f273c46b29d1ba60e2caa9c925ecb] | committer: Rémi Denis-Courmont 

Revert "sd: Export internals with a getters."

This reverts commit 027b44025e11be76c4c3f9e34c2648841f389f14.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=350b1052769f273c46b29d1ba60e2caa9c925ecb
---

 include/vlc_services_discovery.h      |    2 --
 modules/misc/lua/services_discovery.c |    9 ++++-----
 src/libvlccore.sym                    |    2 --
 src/playlist/services_discovery.c     |   14 --------------
 4 files changed, 4 insertions(+), 23 deletions(-)

diff --git a/include/vlc_services_discovery.h b/include/vlc_services_discovery.h
index 3a4e988..0e659f0 100644
--- a/include/vlc_services_discovery.h
+++ b/include/vlc_services_discovery.h
@@ -71,8 +71,6 @@ VLC_EXPORT( services_discovery_t *, vlc_sd_Create, ( vlc_object_t *, const char
 VLC_EXPORT( bool, vlc_sd_Start, ( services_discovery_t * ) );
 VLC_EXPORT( void, vlc_sd_Stop, ( services_discovery_t * ) );
 VLC_EXPORT( void, vlc_sd_Destroy, ( services_discovery_t * ) );
-VLC_EXPORT( const char *, vlc_sd_GetName, ( services_discovery_t * ) );
-VLC_EXPORT( config_chain_t *, vlc_sd_GetConfigChain, ( services_discovery_t * ) );
 
 static inline void vlc_sd_StopAndDestroy( services_discovery_t * p_this )
 {
diff --git a/modules/misc/lua/services_discovery.c b/modules/misc/lua/services_discovery.c
index 9df7069..f5e21fd 100644
--- a/modules/misc/lua/services_discovery.c
+++ b/modules/misc/lua/services_discovery.c
@@ -57,21 +57,20 @@ int Open_LuaSD( vlc_object_t *p_this )
     services_discovery_t *p_sd = ( services_discovery_t * )p_this;
     services_discovery_sys_t *p_sys;
     lua_State *L = NULL;
-    char *psz_name;
+    char *psz_name = strdup(p_sd->psz_name);
 
-
-    if( !strcmp(vlc_sd_GetName(p_sd), "lua"))
+    if( !strcmp(p_sd->psz_name, "lua"))
     {
         // We want to load the module name "lua"
         // This module can be used to load lua script not registered
         // as builtin lua SD modules.
-        config_ChainParse( p_sd, "lua-", ppsz_sd_options, vlc_sd_GetConfigChain(p_sd) );
+        config_ChainParse( p_sd, "lua-", ppsz_sd_options, p_sd->p_cfg );
         psz_name = var_CreateGetString( p_sd, "lua-sd" );
     }
     else
     {
         // We are loading a builtin lua sd module.
-        psz_name = strdup(vlc_sd_GetName(p_sd));
+        psz_name = strdup(p_sd->psz_name);
     }
 
     if( !( p_sys = malloc( sizeof( services_discovery_sys_t ) ) ) )
diff --git a/src/libvlccore.sym b/src/libvlccore.sym
index 6bdedca..85da6f3 100644
--- a/src/libvlccore.sym
+++ b/src/libvlccore.sym
@@ -563,8 +563,6 @@ vlc_rwlock_wrlock
 vlc_savecancel
 vlc_sd_Create
 vlc_sd_Destroy
-vlc_sd_GetConfigChain
-vlc_sd_GetName
 vlc_sd_GetNames
 vlc_sd_probe_Add
 vlc_sdp_Start
diff --git a/src/playlist/services_discovery.c b/src/playlist/services_discovery.c
index 3040d6c..c9f9aff 100644
--- a/src/playlist/services_discovery.c
+++ b/src/playlist/services_discovery.c
@@ -186,20 +186,6 @@ void vlc_sd_Destroy( services_discovery_t *p_sd )
 }
 
 /***********************************************************************
- * Getters
- ***********************************************************************/
-
-const char *vlc_sd_GetName( services_discovery_t *p_sd )
-{
-    return p_sd->p->psz_name;
-}
-
-config_chain_t *vlc_sd_GetConfigChain( services_discovery_t *p_sd )
-{
-    return p_sd->p->p_cfg;
-}
-
-/***********************************************************************
  * Destructor
  ***********************************************************************/
 static void services_discovery_Destructor ( vlc_object_t *p_obj )




More information about the vlc-devel mailing list