Update lua playlist scripts to new API. (untested)

diff --git a/share/lua/playlist/appletrailers.lua b/share/lua/playlist/appletrailers.lua
index 5a754aea1e397628f555f6805a4ab7a9e2a61bdc..0509d8f50ce501ad6624ac3927fd888125b53381 100644 (file)
--- a/share/lua/playlist/appletrailers.lua
+++ b/share/lua/playlist/appletrailers.lua
@@ -37,9 +37,9 @@ function parse()
         or string.match( line, "http://images.apple.com/movies/.*%.mov" )
         then
             if string.match( line, "http://movies.apple.com/movies/.*%.mov" ) then
-                path = vlc.decode_uri( string.gsub( line, "^.*(http://movies.apple.com/movies/.*%.mov).*$", "%1" ) )
+                path = vlc.strings.decode_uri( string.gsub( line, "^.*(http://movies.apple.com/movies/.*%.mov).*$", "%1" ) )
             elseif string.match( line, "http://images.apple.com/movies/.*%.mov" ) then
-                path = vlc.decode_uri( string.gsub( line, "^.*(http://images.apple.com/movies/.*%.mov).*$", "%1" ) )
+                path = vlc.strings.decode_uri( string.gsub( line, "^.*(http://images.apple.com/movies/.*%.mov).*$", "%1" ) )
             end
             if string.match( path, "480p" ) then
                 extraname = " (480p)"
@@ -54,11 +54,11 @@ function parse()
         end
         if string.match( line, "<title>" )
         then
-            title = vlc.decode_uri( string.gsub( line, "^.*<title>([^<]*).*$", "%1" ) )
+            title = vlc.strings.decode_uri( string.gsub( line, "^.*<title>([^<]*).*$", "%1" ) )
         end
         if string.match( line, "<meta name=\"Description\"" )
         then
-            description = vlc.resolve_xml_special_chars( string.gsub( line, "^.*name=\"Description\" content=\"([^\"]*)\".*$", "%1" ) )
+            description = vlc.strings.resolve_xml_special_chars( string.gsub( line, "^.*name=\"Description\" content=\"([^\"]*)\".*$", "%1" ) )
         end
     end
     return p

diff --git a/share/lua/playlist/canalplus.lua b/share/lua/playlist/canalplus.lua
index a83ad92144b8b6ac9c942bcae37280e97c5bf025..1a59956dc3151c9870924d0e85c620d2b8bef57a 100644 (file)
--- a/share/lua/playlist/canalplus.lua
+++ b/share/lua/playlist/canalplus.lua
@@ -26,7 +26,7 @@ end
 -- Parse function.
 function parse()
     p = {}
-    --vlc.msg_dbg( vlc.path )
+    --vlc.msg.dbg( vlc.path )
     if string.match( vlc.path, "www.canalplus.fr/index.php%?pid=" )
     then -- This is the HTML page's URL
         local id, name, description, arturl
@@ -34,7 +34,7 @@ function parse()
             -- Try to find the video's title
             local line = vlc.readline()
             if not line then break end
-            -- vlc.msg_dbg( line )
+            -- vlc.msg.dbg( line )
             if string.match( line, "aVideos" ) then
                 if string.match( line, "CONTENT_ID.*=" ) then
                     id = string.gsub( line, "^.*\"(.-)\".*$", "%1" )
@@ -61,10 +61,10 @@ function parse()
         while true do
             local line = vlc.readline()
             if not line then break end
-            --vlc.msg_dbg( line )
+            --vlc.msg.dbg( line )
             if string.match( line, "<hi>" ) then
                 local path = string.gsub( line, "^.*%[(.-)%].*$", "%1" )
-                vlc.msg_err("Path is: " .. tostring( path ) )
+                vlc.msg.err("Path is: " .. tostring( path ) )
                 return { { path = path } }
             end
         end
@@ -76,10 +76,10 @@ function get_url_param( url, name )
 end
 
 function add_item( p, id, name, description, arturl )
-    --[[vlc.msg_dbg( "id: " .. tostring(id) )
-    vlc.msg_dbg( "name: " .. tostring(name) )
-    vlc.msg_dbg( "arturl: " .. tostring(arturl) )
-    vlc.msg_dbg( "description: " .. tostring(description) )
+    --[[vlc.msg.dbg( "id: " .. tostring(id) )
+    vlc.msg.dbg( "name: " .. tostring(name) )
+    vlc.msg.dbg( "arturl: " .. tostring(arturl) )
+    vlc.msg.dbg( "description: " .. tostring(description) )
     --]]
     --local path = "http://www.canalplus.fr/flash/xml/configuration/configuration-embed-video-player.php?xmlParam="..id.."-"..get_url_param(vlc.path,"pid")
     local path = "http://www.canalplus.fr/flash/xml/module/embed-video-player/embed-video-player.php?video_id="..id.."&pid="..get_url_param(vlc.path,"pid")

diff --git a/share/lua/playlist/dailymotion.lua b/share/lua/playlist/dailymotion.lua
index f334cd21dbedfef8fbaefa1165b074046012514c..009eb1372dfda1f679341b3000e4aa5b143afd30 100644 (file)
--- a/share/lua/playlist/dailymotion.lua
+++ b/share/lua/playlist/dailymotion.lua
@@ -36,8 +36,8 @@ function parse()
         if not line then break end
         if string.match( line, "param name=\"flashvars\" value=\".*video=" )
         then
-            arturl = vlc.decode_uri( string.gsub( line, "^.*param name=\"flashvars\" value=\".*preview=([^&]*).*$", "%1" ) )
-            videos = vlc.decode_uri( string.gsub( line, "^.*param name=\"flashvars\" value=\".*video=([^&]*).*$", "%1" ) )
+            arturl = vlc.strings.decode_uri( string.gsub( line, "^.*param name=\"flashvars\" value=\".*preview=([^&]*).*$", "%1" ) )
+            videos = vlc.strings.decode_uri( string.gsub( line, "^.*param name=\"flashvars\" value=\".*video=([^&]*).*$", "%1" ) )
        --[[ we get a list of different streams available, at various codecs
             and resolutions:
             /A@@spark||/B@@spark-mini||/C@@vp6-hd||/D@@vp6||/E@@h264
@@ -62,7 +62,7 @@ function parse()
             local bestcodec
             for codec,_ in pairs(available) do
                 if pref[codec] == nil then
-                    vlc.msg_warn( "Unknown codec: " .. codec )
+                    vlc.msg.warn( "Unknown codec: " .. codec )
                     pref[codec] = 42 -- try the 1st unknown codec if other fail
                 end
                 if pref[codec] < score then
@@ -76,8 +76,8 @@ function parse()
         end
         if string.match( line, "<meta name=\"description\"" )
         then
-            name = vlc.resolve_xml_special_chars( string.gsub( line, "^.*name=\"description\" content=\"%w+ (.*) %w+ %w+ %w+ %w+ Videos\..*$", "%1" ) )
-            description = vlc.resolve_xml_special_chars( string.gsub( line, "^.*name=\"description\" content=\"%w+ .* %w+ %w+ %w+ %w+ Videos\. ([^\"]*)\".*$", "%1" ) )
+            name = vlc.strings.resolve_xml_special_chars( string.gsub( line, "^.*name=\"description\" content=\"%w+ (.*) %w+ %w+ %w+ %w+ Videos\..*$", "%1" ) )
+            description = vlc.strings.resolve_xml_special_chars( string.gsub( line, "^.*name=\"description\" content=\"%w+ .* %w+ %w+ %w+ %w+ Videos\. ([^\"]*)\".*$", "%1" ) )
         end
         if path and name and description and arturl then break end
     end

diff --git a/share/lua/playlist/france2.lua b/share/lua/playlist/france2.lua
index 80f2072d8849ed7ba7bf33689be2d30ea8184bbd..343f7a44548b6a81b18e356cd9ec04654e1079d6 100644 (file)
--- a/share/lua/playlist/france2.lua
+++ b/share/lua/playlist/france2.lua
@@ -46,7 +46,7 @@ function parse()
             if oldtime then
                 table.insert( p, { path = video; name = name; duration = time - oldtime; options = { ':start-time='..tostring(oldtime); ':stop-time='..tostring(time) } } )
             end
-            name = vlc.resolve_xml_special_chars( string.gsub( line, "^.*>(.*)<..*$", "%1" ) )
+            name = vlc.strings.resolve_xml_special_chars( string.gsub( line, "^.*>(.*)<..*$", "%1" ) )
         end
     end
     if oldtime then

diff --git a/share/lua/playlist/googlevideo.lua b/share/lua/playlist/googlevideo.lua
index 57cc281b8ac8faaed7422f5ac3d43357d7752ed2..297dd21f165d8592fb702feeac278743254e5c02 100644 (file)
--- a/share/lua/playlist/googlevideo.lua
+++ b/share/lua/playlist/googlevideo.lua
@@ -37,7 +37,7 @@ function parse()
         if string.match( line, "src=\"/googleplayer.swf" ) then
             url = string.gsub( line, ".*videoUrl=([^&]*).*" ,"%1" )
             arturl = string.gsub( line, ".*thumbnailUrl=([^\"]*).*", "%1" )
-            return { { path = vlc.decode_uri(url), title = title, arturl = vlc.decode_uri(arturl) } }
+            return { { path = vlc.strings.decode_uri(url), title = title, arturl = vlc.strings.decode_uri(arturl) } }
         end
     end
 end

diff --git a/share/lua/playlist/megavideo.lua b/share/lua/playlist/megavideo.lua
index 44a04f26b39be357f42faee4bd55127ee6aa24cf..412e1d3d1a95e436cfc7603c76949f5333d0cc23 100644 (file)
--- a/share/lua/playlist/megavideo.lua
+++ b/share/lua/playlist/megavideo.lua
@@ -60,7 +60,7 @@ function parse()
                 if c < 16 and c > 3 then key = 61 + mod
                 elseif c < 96 and c > 67 then key = 189 + mod
                 elseif c < 20 and c > 6 then key = 65
-                else vlc.msg_err("Oops, please report URL to developers")
+                else vlc.msg.err("Oops, please report URL to developers")
                 end
                 i = i + 1
                 path = path .. string.char(key - c)

diff --git a/share/lua/playlist/youtube.lua b/share/lua/playlist/youtube.lua
index ea1a6134af58df6913be575fd65c6528a5ddb2d2..0643c249be91d1f99be7a463e41aa32d979cd6ba 100644 (file)
--- a/share/lua/playlist/youtube.lua
+++ b/share/lua/playlist/youtube.lua
@@ -25,7 +25,7 @@ end
 
 function get_arturl( path, video_id )
     if string.match( vlc.path, "iurl=" ) then
-        return vlc.decode_uri( get_url_param( vlc.path, "iurl" ) )
+        return vlc.strings.decode_uri( get_url_param( vlc.path, "iurl" ) )
     end
     if not arturl then
         return "http://img.youtube.com/vi/"..video_id.."/default.jpg"

diff --git a/share/lua/playlist/youtube_homepage.lua b/share/lua/playlist/youtube_homepage.lua
index 5c7e88af938622aecc870c3f1d25c5f5582c374b..533e55836b755ee01befe250bd672d829bb76c93 100644 (file)
--- a/share/lua/playlist/youtube_homepage.lua
+++ b/share/lua/playlist/youtube_homepage.lua
@@ -34,7 +34,7 @@ function parse()
         for _path, _artist, _name in string.gmatch( line, "href=\"(/watch%?v=[^\"]*)\" onclick=\"_hbLink%('([^']*)','Vid[^\']*'%);\">([^<]*)</a><br/>" )
         do
             path = "http://www.youtube.com" .. _path
-            name = vlc.resolve_xml_special_chars( _name )
+            name = vlc.strings.resolve_xml_special_chars( _name )
             artist = _artist
         end
         for _min, _sec in string.gmatch( line, "<span class=\"runtime\">(%d*):(%d*)</span>" )