vlc | branch: master | Pierre Ynard <[email protected]> | Sat Jan 7 13:41:19 2012 +0100| [b33269e785fbe4541c2b52700181c005066528d9] | committer: Jean-Baptiste Kempf
cue.lua: fix file path concatenation Use the same approach as in the playlist module This should fix #5398 Signed-off-by: Jean-Baptiste Kempf <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b33269e785fbe4541c2b52700181c005066528d9 --- share/lua/playlist/cue.lua | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diff --git a/share/lua/playlist/cue.lua b/share/lua/playlist/cue.lua index 384a40f..794a400 100644 --- a/share/lua/playlist/cue.lua +++ b/share/lua/playlist/cue.lua @@ -43,15 +43,14 @@ function cue_path( src ) if( string.match( src, "^/" ) or string.match( src, "^\\" ) or string.match( src, "^[%l%u]:\\" ) ) then - return src + return vlc.strings.make_uri(src) end - local path = string.gsub( vlc.strings.decode_uri(vlc.path), '\\', '/' ) - local slash = string.find( string.reverse( path ), '/' ) - if( path == nil ) then - return src - end - return string.sub( path, 1, -slash-1 ) .. '/' .. src + local slash = string.find( string.reverse( vlc.path ), '/' ) + local prefix = vlc.access .. "://" .. string.sub( vlc.path, 1, -slash ) + -- FIXME: postfix may not be encoded correctly (esp. slashes) + local postfix = vlc.strings.encode_uri_component(src) + return prefix .. postfix end function cue_track( global, track ) @@ -60,7 +59,7 @@ function cue_track( global, track ) end t = {} - t.path = vlc.strings.make_uri(cue_path( track.file or global.file )) + t.path = cue_path( track.file or global.file ) t.title = track.title t.album = global.title t.artist = track.performer or global.performer _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
