Commit 350b1052 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Revert "sd: Export internals with a getters."

This reverts commit 027b4402.
parent 10c43ff0
......@@ -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 )
{
......
......@@ -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 ) ) ) )
......
......@@ -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
......
......@@ -185,20 +185,6 @@ void vlc_sd_Destroy( services_discovery_t *p_sd )
vlc_object_release( 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
***********************************************************************/
......
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