[vlc-commits] Fixed jamendo playlist demuxer.

Laurent Aimar git at videolan.org
Sat Jan 7 01:50:00 CET 2012


vlc/vlc-1.2 | branch: master | Laurent Aimar <fenrir at videolan.org> | Sat Jan  7 01:43:03 2012 +0100| [056b713c9f6135b3df5e7edc176ab66ea45ede09] | committer: Jean-Baptiste Kempf

Fixed jamendo playlist demuxer.

The check is a bit less strict to adapt to the various URL we can get.
It closes #5661.
(cherry picked from commit 13295779a6dbc6924c28343e4ff47e5ef6345a40)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.2.git/?a=commit;h=056b713c9f6135b3df5e7edc176ab66ea45ede09
---

 share/lua/playlist/jamendo.lua |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/share/lua/playlist/jamendo.lua b/share/lua/playlist/jamendo.lua
index 473d01c..9edbccf 100644
--- a/share/lua/playlist/jamendo.lua
+++ b/share/lua/playlist/jamendo.lua
@@ -25,8 +25,10 @@ require "simplexml"
 -- Probe function.
 function probe()
     return vlc.access == "http"
-        and string.match( vlc.path, "jamendo.com/get2/" )
-        and string.match( vlc.path, "/track/xml/" )
+        and string.match( vlc.path, "api.jamendo.com/" )
+        and string.match( vlc.path, "get2" )
+        and string.match( vlc.path, "track" )
+        and string.match( vlc.path, "xml" )
 end
 
 -- Parse function.



More information about the vlc-commits mailing list