[vlc-commits] luasd: remove "longname" parameter

[Pierre Ynard]

vlc | branch: master | Pierre Ynard <linkfanel at yahoo.fr> | Wed Nov 16 09:06:49 2016 +0100| [88ca90c26f1645cd2b8d257ddbc504cdc393db9a] | committer: Pierre Ynard

luasd: remove "longname" parameter

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

 modules/lua/services_discovery.c | 2 +-
 modules/lua/vlc.c                | 8 +-------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/modules/lua/services_discovery.c b/modules/lua/services_discovery.c
index 14b6c18..09ba48a 100644
--- a/modules/lua/services_discovery.c
+++ b/modules/lua/services_discovery.c
@@ -76,7 +76,7 @@ const char *vlclua_sd_description( vlc_object_t *obj, lua_State *L,
 }
 #define vlclua_sd_description(a, b, c) vlclua_sd_description(VLC_OBJECT(a), b, c)
 
-static const char * const ppsz_sd_options[] = { "sd", "longname", NULL };
+static const char * const ppsz_sd_options[] = { "sd", NULL };
 
 /*****************************************************************************
  * Local structures
diff --git a/modules/lua/vlc.c b/modules/lua/vlc.c
index bae806d..2356b36 100644
--- a/modules/lua/vlc.c
+++ b/modules/lua/vlc.c
@@ -168,8 +168,6 @@ vlc_module_begin ()
         set_capability( "services_discovery", 0 )
         add_string( "lua-sd", "", NULL, NULL, false )
             change_volatile()
-        add_string( "lua-longname", "", NULL, NULL, false )
-            change_volatile()
         set_callbacks( Open_LuaSD, Close_LuaSD )
 
     VLC_SD_PROBE_SUBMODULE
@@ -686,17 +684,13 @@ static int vlc_sd_probe_Open( vlc_object_t *obj )
                 psz_longname = *ppsz_file;
 
             char *psz_file_esc = config_StringEscape( *ppsz_file );
-            char *psz_longname_esc = config_StringEscape( psz_longname );
-            if( asprintf( &psz_name, "lua{sd='%s',longname='%s'}",
-                          psz_file_esc, psz_longname_esc ) < 0 )
+            if( asprintf( &psz_name, "lua{sd='%s'}", psz_file_esc ) < 0 )
             {
                 free( psz_file_esc );
-                free( psz_longname_esc );
                 free( psz_filename );
                 goto error;
             }
             free( psz_file_esc );
-            free( psz_longname_esc );
             vlc_sd_probe_Add( probe, psz_name, psz_longname, SD_CAT_INTERNET );
             free( psz_name );
             free( psz_filename );