Lua: input_AddSubtitle expects a file path, not an URL (fixes #11449)

diff --git a/modules/lua/libs/input.c b/modules/lua/libs/input.c
index bdffbc9ea52453daf4e18f83749dafbdfc1867ef..5b800802ac53d8941e38c5952bbbc139fe7af143 100644 (file)
--- a/modules/lua/libs/input.c
+++ b/modules/lua/libs/input.c
@@ -218,9 +218,9 @@ static int vlclua_input_add_subtitle( lua_State *L )
     if( !p_input )
         return luaL_error( L, "can't add subtitle: no current input" );
     if( !lua_isstring( L, 1 ) )
-        return luaL_error( L, "vlc.input.add_subtitle() usage: (url)" );
-    const char *psz_url = luaL_checkstring( L, 1 );
-    input_AddSubtitle( p_input, psz_url, false );
+        return luaL_error( L, "vlc.input.add_subtitle() usage: (path)" );
+    const char *psz_path = luaL_checkstring( L, 1 );
+    input_AddSubtitle( p_input, psz_path, false );
     vlc_object_release( p_input );
     return 1;
 }

diff --git a/share/lua/README.txt b/share/lua/README.txt
index eb6a8b1135f955676bdaf43a987c8800d49ebc86..5d3343b1300844a6682ecb1ef3a9dd09807b0150 100644 (file)
--- a/share/lua/README.txt
+++ b/share/lua/README.txt
@@ -103,7 +103,7 @@ h:redirect( url_dst, url_src ): Redirect all connections from url_src to url_dst
 Input
 -----
 input.is_playing(): Return true if input exists.
-input.add_subtitle(url): Add a subtitle to the current input
+input.add_subtitle(url): Add a subtitle file (by path) to the current input
 input.item(): Get the current input item. Input item methods are:
   :uri(): Get item's URI.
   :name(): Get item's name.

diff --git a/share/lua/intf/modules/httprequests.lua b/share/lua/intf/modules/httprequests.lua
index f16e2057405c225cf1392db0e2ebec1a1e852719..5e7351d260cb94ca1861dd645d75bf4f502b6069 100644 (file)
--- a/share/lua/intf/modules/httprequests.lua
+++ b/share/lua/intf/modules/httprequests.lua
@@ -91,7 +91,7 @@ processcommands = function ()
         --]]
         vlc.playlist.add({{path=vlc.strings.make_uri(input),options=options,name=name,duration=duration}})
     elseif command == "addsubtitle" then
-        vlc.input.add_subtitle (vlc.strings.make_uri(val))
+        vlc.input.add_subtitle (val)
     elseif command == "in_enqueue" then
         vlc.playlist.enqueue({{path=vlc.strings.make_uri(input),options=options,name=name,duration=duration}})
     elseif command == "pl_play" then