[vlc-devel] [vlc-commits] lua: remove RC interface aliases

Rémi Denis-Courmont remi at remlab.net
Wed May 29 09:32:27 CEST 2019


It's needed by Lua telnet for the time being.

Le 29 mai 2019 09:48:05 GMT+03:00, Thomas Guillem <thomas at gllm.fr> a écrit :
>You didn't removed share/lua/intf/cli.lua. Is it intended ?
>
>On Tue, May 28, 2019, at 19:03, Rémi Denis-Courmont wrote:
>> vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Tue
>May 
>> 28 19:52:33 2019 +0300| [13c2620955c2658433565573b1ec98674ffef4e4] | 
>> committer: Rémi Denis-Courmont
>> 
>> lua: remove RC interface aliases
>> 
>> >
>http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=13c2620955c2658433565573b1ec98674ffef4e4
>> ---
>> 
>>  modules/lua/intf.c | 15 ---------------
>>  modules/lua/vlc.c  | 21 ---------------------
>>  2 files changed, 36 deletions(-)
>> 
>> diff --git a/modules/lua/intf.c b/modules/lua/intf.c
>> index 63c902bf21..58976d67fe 100644
>> --- a/modules/lua/intf.c
>> +++ b/modules/lua/intf.c
>> @@ -125,21 +125,6 @@ static char *MakeConfig( intf_thread_t *p_intf, 
>> const char *name )
>>          free( psz_passwd );
>>          free( psz_host );
>>      }
>> -    else if( !strcmp( name, "cli" ) )
>> -    {
>> -        char *psz_rc_host = var_InheritString( p_intf, "rc-host" );
>> -        if( !psz_rc_host )
>> -            psz_rc_host = var_InheritString( p_intf, "cli-host" );
>> -        if( psz_rc_host )
>> -        {
>> -            char *psz_esc_host = config_StringEscape( psz_rc_host );
>> -
>> -            if( asprintf( &psz_config, "cli={host='%s'}",
>psz_esc_host 
>> ) == -1 )
>> -                psz_config = NULL;
>> -            free( psz_esc_host );
>> -            free( psz_rc_host );
>> -        }
>> -    }
>>  
>>      return psz_config;
>>  }
>> diff --git a/modules/lua/vlc.c b/modules/lua/vlc.c
>> index 3aaaaf0d31..94412355c0 100644
>> --- a/modules/lua/vlc.c
>> +++ b/modules/lua/vlc.c
>> @@ -69,14 +69,6 @@
>>  #define TELNETPWD_TEXT N_( "Password" )
>>  #define TELNETPWD_LONGTEXT N_( "A single password restricts access "
>\
>>      "to this interface." )
>> -#define RCHOST_TEXT N_("TCP command input")
>> -#define RCHOST_LONGTEXT N_("Accept commands over a socket rather
>than 
>> stdin. " \
>> -            "You can set the address and port the interface will
>bind 
>> to." )
>> -#define CLIHOST_TEXT N_("CLI input")
>> -#define CLIHOST_LONGTEXT N_( "Accept commands from this source. " \
>> -    "The CLI defaults to stdin (\"*console\"), but can also bind to
>a 
>> " \
>> -    "plain TCP socket (\"localhost:4212\") or use the telnet
>protocol 
>> " \
>> -    "(\"telnet://0.0.0.0:4212\")" )
>>  
>>  static int vlc_sd_probe_Open( vlc_object_t * );
>>  
>> @@ -103,19 +95,6 @@ vlc_module_begin ()
>>          set_description( N_("Lua HTTP") )
>>  
>>      add_submodule ()
>> -        set_section( N_("Lua CLI"), 0 )
>> -            add_string( "rc-host", NULL, RCHOST_TEXT,
>RCHOST_LONGTEXT, 
>> true )
>> -            add_string( "cli-host", NULL, CLIHOST_TEXT, 
>> CLIHOST_LONGTEXT, true )
>> -        set_capability( "interface", 25 )
>> -        set_description( N_("Command-line interface") )
>> -        set_callbacks( Open_LuaCLI, Close_LuaIntf )
>> -#ifndef _WIN32
>> -        add_shortcut( "luacli", "luarc", "cli", "rc" )
>> -#else
>> -        add_shortcut( "luacli", "luarc" )
>> -#endif
>> -
>> -    add_submodule ()
>>          set_section( N_("Lua Telnet"), 0 )
>>              add_string( "telnet-host", "localhost", TELNETHOST_TEXT,
>>                          TELNETHOST_LONGTEXT, true )
>> 
>> _______________________________________________
>> vlc-commits mailing list
>> vlc-commits at videolan.org
>> https://mailman.videolan.org/listinfo/vlc-commits
>>
>_______________________________________________
>vlc-devel mailing list
>To unsubscribe or modify your subscription options:
>https://mailman.videolan.org/listinfo/vlc-devel

-- 
Envoyé de mon appareil Android avec Courriel K-9 Mail. Veuillez excuser ma brièveté.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mailman.videolan.org/pipermail/vlc-devel/attachments/20190529/985bbacc/attachment.html>


More information about the vlc-devel mailing list