videolan/vlc
1
Fork 0
mirror of https://code.videolan.org/videolan/vlc synced 2024-09-04 09:11:33 +02:00
Code Releases Activity

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

Browse Source
This commit is contained in:
Rémi Denis-Courmont 2014-05-06 22:25:33 +03:00
parent 2ddd0f3eb3
commit a5a33334e8
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/lua/libs/input.c
View File

@ -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;
}

2
share/lua/README.txt
View File

@ -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.

2
share/lua/intf/modules/httprequests.lua
View File

@ -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