Index: Makefile
==================================================================
--- Makefile
+++ Makefile
@@ -5,11 +5,11 @@
 SHELL   := /bin/bash #(for brace expansion)
 NAME    := streamtuner2
 VERSION := $(shell version get:plugin st2.py || echo 2.1dev)
 DEST    := /usr/share/streamtuner2
 INST    := install -m 644
-PACK    := xpm --verbose
+PACK    := xpm
 DEPS    := -n $(NAME) -d python -d python-pyquery -d python-gtk2 -d python-requests -d python-keybinder
 OPTS    := -s src -u packfile,man,fixperms -f --prefix=$(DEST) --deb-compression xz --rpm-compression xz --exe-autoextract
 
 # targets
 .PHONY:	bin
@@ -49,11 +49,11 @@
 exe:
 	$(PACK) $(OPTS) $(DEPS) -t $@ -p "$(NAME)-VERSION.exe" st2.py
 pyz:
         #@BUG: relative package references leave a /tmp/doc/ folder
 	$(PACK) -u packfile -s src -t zip --zip-shebang "/usr/bin/env python"	\
-		-f -p "$(NAME)-$(VERSION).pyz" --prefix=./ --verbose .zip.py st2.py
+		-f -p "$(NAME)-$(VERSION).pyz" --prefix=./  .zip.py st2.py
 src:
 	cd .. && pax -wvJf streamtuner2/streamtuner2-$(VERSION).src.txz \
 		streamtuner2/*.{py,png,svg,desktop} streamtuner2/channels/*.{py,png} \
 		streamtuner2/{bundle/,help/,gtk,NEWS,READ,PACK,PKG,CRED,Make,bin,.zip}*
 

Index: action.py
==================================================================
--- action.py
+++ action.py
@@ -34,10 +34,11 @@
 from config import conf, __print__ as debug, dbg
 import platform
 import copy
 import json
 from datetime import datetime
+from xml.sax.saxutils import escape as xmlentities, unescape as xmlunescape
 
 
 # Coupling to main window
 #
 main = None
@@ -98,11 +99,12 @@
    ("html", r""" (?i)<(audio|video)\b[^>]+\bsrc\s*=\s*["']?https?:// """),
    ("wpl",  r""" <\?wpl \s+ version="1\.0" \s* \?> """),
    ("b4s",  r""" <WinampXML> """),   # http://gonze.com/playlists/playlist-format-survey.html
    ("jspf", r""" ^ \s* \{ \s* "playlist": \s* \{ """),
    ("asf",  r""" ^ \[Reference\] .*? ^Ref\d+= """),
-   ("json", r""" "url": \s* "\w+:// """),
+   ("json", r""" "url": \s* "\w+:\\?/\\?/ """),
+   ("jamj", r""" "audio": \s* "\w+:\\?/\\?/ """),
    ("gvp",  r""" ^gvp_version:1\.\d+$ """),
    ("href", r""" .* """),
 ]
 
 
@@ -233,11 +235,11 @@
     # Check ambiguity (except pseudo extension)
     if len(set([source, mime, probe])) > 1:
         debug(dbg.ERR, "Possible playlist format mismatch:", (source, mime, probe, ext))
 
     # Extract URLs from content
-    for fmt in ["pls", "xspf", "asx", "smil", "jspf", "m3u", "json", "asf", "raw"]:
+    for fmt in ["pls", "xspf", "asx", "smil", "jspf", "m3u", "json", "asf", "jamj", "raw"]:
         if not urls and fmt in (source, mime, probe, ext, "raw"):
             urls = extract_playlist(cnt).format(fmt)
             debug(dbg.DATA, "conversion from:", source, " with extractor:", fmt, "got URLs=", urls)
             
     # Return original, or asis for srv targets
@@ -297,20 +299,29 @@
         self.src = text
         
     # Extract only URLs from given source type
     def format(self, fmt):
         debug(dbg.DATA, "input regex:", fmt, len(self.src))
-        return re.findall(self.extr_urls[fmt], self.src, re.X);
+        # regex
+        urls = re.findall(self.extr_urls[fmt], self.src, re.X)
+        # xml entities
+        urls = [xmlunescape(url) for url in urls]
+        # json escaping
+        urls = [url.replace("\\/", "/") for url in urls]
+        # uniques
+        urls = list(set(urls))
+        return urls
 
     # Only look out for URLs, not local file paths
     extr_urls = {
        "pls":  r"(?im) ^ \s*File\d* \s*=\s* (\w+://[^\s]+) ",
        "m3u":  r" (?m) ^( \w+:// [^#\n]+ )",
        "xspf": r" (?x) <location> (\w+://[^<>\s]+) </location> ",
        "asx":  r" (?x) <ref \b[^>]+\b href \s*=\s* [\'\"] (\w+://[^\s\"\']+) [\'\"] ",
        "smil": r" (?x) <(?:audio|video|media)\b [^>]+ \b src \s*=\s* [^\"\']? \s* (\w+://[^\"\'\s]+) ",
        "jspf": r" (?x) \"location\" \s*:\s* \"(\w+://[^\"\s]+)\" ",
+       "jamj": r" (?x) \"audio\" \s*:\s* \"(\w+:\\?/\\?/[^\"\s]+)\" ",
        "json": r" (?x) \"url\" \s*:\s* \"(\w+://[^\"\s]+)\" ",
        "asf":  r" (?m) ^ \s*Ref\d+ = (\w+://[^\s]+) ",
        "raw":  r" (?i) ( [\w+]+:// [^\s\"\'\>\#]+ ) ",
     }
 
@@ -358,10 +369,11 @@
         if not self.source in ("srv", "raw", "asis"):
             new_rows = []
             for i,row in enumerate(rows):
                 # Preferrably convert to direct server addresses
                 for url in convert_playlist(row["url"], self.source, "srv", local_file=False):
+                    row = dict(row.items())
                     row["url"] = url
                     new_rows.append(row)
                     # Or just allow one stream per station in a playlist entry
                     if not self.multiply:
                         break
@@ -441,17 +453,10 @@
                 txt += """\t\t<audio src="%s"/>\n""" % row["url"]
         txt += """\t</seq>\n</body>\n</smil>\n"""
         return txt
 
 
-
-# Stub import, only if needed
-def xmlentities(s):
-    global xmlentities
-    from xml.sax.saxutils import escape as xmlentities
-    return xmlentities(s)
-
 
 
 # Generate filename for temporary .m3u, if possible with unique id
 def tmp_fn(pls, ext="m3u"):
     # use shoutcast unique stream id if available

Index: channels/jamendo.py
==================================================================
--- channels/jamendo.py
+++ channels/jamendo.py
@@ -55,10 +55,11 @@
 class jamendo (ChannelPlugin):
 
     # control flags
     has_search = True
     base = "http://www.jamendo.com/en/"
+    audioformat = "ogg"
     listformat = "srv"
     api_base = "http://api.jamendo.com/v3.0/"
     cid = "49daa4f5"
     categories = []
     titles = dict( title="Title", playing="Album/Artist/User", bitrate=False, listeners=False )
@@ -258,34 +259,41 @@
     # retrieve category or search
     def update_streams(self, cat, search=None):
 
         entries = []
         fmt = self.stream_mime(conf.jamendo_stream_format)
-        
+                
         # Static list of Radios
         if cat == "radios":
             for radio in ["BestOf", "Pop", "Rock", "Lounge", "Electro", "HipHop", "World", "Jazz", "Metal", "Soundtrack", "Relaxation", "Classical"]:
                 entries.append({
                     "genre": radio,
                     "title": radio,
-                    "url": "http://streaming.radionomy.com/Jam" + radio,
+                    "url": "http://streaming.radionomy.com/Jam" + radio,  # optional +".m3u"
                     "playing": "various artists",
                     "format": "audio/mpeg",
                     "homepage": "http://www.jamendo.com/en/radios",
                     "img": "http://imgjam1.jamendo.com/new_jamendo_radios/%s30.jpg" % radio.lower(),
                 })
         
         # Playlist
         elif cat == "playlists":
-            for e in self.api(method = cat, order = "creationdate_desc"):
+            for e in self.api(method="playlists", order="creationdate_desc"):
                 entries.append({
                     "title": e["name"],
                     "playing": e["user_name"],
                     "homepage": e["shareurl"],
-                    #"url": "http://api.jamendo.com/v3.0/playlists/file?client_id=%s&id=%s" % (self.cid, e["id"]),
-                    "url": "http://api.jamendo.com/get2/stream/track/xspf/?playlist_id=%s&n=all&order=random&from=app-%s" % (e["id"], self.cid),
-                    "format": "application/xspf+xml",
+                    "extra": e["creationdate"],
+                    "format": "audio/mpeg",
+                    #"listformat": "xspf", # deprecated
+                    #"url": "http://api.jamendo.com/get2/stream/track/xspf/?playlist_id=%s&n=all&order=random&from=app-%s" % (e["id"], self.cid),
+                    #"listformat": "href", # raw ZIP redirect
+                    #"url": "http://api.jamendo.com/v3.0/playlists/file?client_id={}&audioformat=mp32&id={}".format(self.cid, e["id"]),
+                    #"listformat": "href", # raw ZIP direct
+                    #"url": e["zip"],
+                    "listformat": "jamj",
+                    "url": "http://api.jamendo.com/v3.0/playlists/tracks?client_id={}&audioformat=mp32&id={}".format(self.cid, e["id"]),
                 })
 
         # Albums
         elif cat in ["albums", "newest"]:
             if cat == "albums":
@@ -299,11 +307,12 @@
                     "playing": e["artist_name"],
                     "img": e["image"],
                     "homepage": e["shareurl"],
                     #"url": "http://api.jamendo.com/v3.0/playlists/file?client_id=%s&id=%s" % (self.cid, e["id"]),
                     "url": "http://api.jamendo.com/get2/stream/track/xspf/?album_id=%s&streamencoding=ogg2&n=all&from=app-%s" % (e["id"], self.cid),
-                    "format": "application/xspf+xml",
+                    "format": "audio/ogg",
+                    "listformat": "xspf",
                 })
 		
         # Genre list, or Search
         else:
             if cat:
@@ -323,11 +332,12 @@
                     "playing": e["album_name"] + " / " + e["artist_name"],
                     "img": e["album_image"],
                     "homepage": e["shareurl"],
                     #"url": e["audio"],
                     "url": "http://storage-new.newjamendo.com/?trackid=%s&format=ogg2&u=0&from=app-%s" % (e["id"], self.cid),
-                    "format": self.stream_mime(fmt),
+                    "format": fmt,
+                    "listformat": "srv",
                 })
  
         # done    
         return entries
 
@@ -363,10 +373,7 @@
         map = {
             "ogg": "audio/ogg", "ogg2": "audio/ogg",
             "mp3": "audio/mpeg", "mp31": "audio/mpeg", "mp32": "audio/mpeg",
             "flac": "audio/flac"
         }
-        if name in map:
-            return map[name]
-        else:
-            return map["mp3"]
+        return map.get(name) or map["mp3"]