Merge branch 'master' of github.com:krebscode/painload

Conflicts:
	god/temper/Makefile
	god/temper/collectd-temper.sh

13 files changed, 692 insertions, 0 deletions

diff --git a/god/streams/.gitignore b/god/streams/.gitignore
new file mode 100644
index 00000000..0d20b648
--- /dev/null
+++ b/god/streams/.gitignore
@@ -0,0 +1 @@
+*.pyc
diff --git a/god/streams/Makefile b/god/streams/Makefile
new file mode 100644
index 00000000..2d0056f4
--- /dev/null
+++ b/god/streams/Makefile
@@ -0,0 +1,16 @@
+INITD = $(shell test -e /etc/rc.d/ && echo /etc/rc.d/ || echo /etc/init.d/)
+streams = $(shell cut -d\  -f2 stream.db)
+
+
+CURRDIR = ${PWD}
+.PHONY: all $(streams)
+local: ../../bin/streams
+
+../../bin/streams:
+	ln -sf $$PWD/bin/streams ../../bin/streams
+all: $(streams)
+	@update-rc.d groove defaults 2>/dev/null || echo "** put groove daemon in DAEMONS in /etc/rc.conf"
+
+$(streams): local
+	@test -L $(INITD)$@ || test ! -e $(INITD)$@ && \
+	ln -n -s -f $$PWD/stream-starter $(INITD)$@ && echo "writing $@ to $(INITD)"
diff --git a/god/streams/README.md b/god/streams/README.md
new file mode 100644
index 00000000..cc763ede
--- /dev/null
+++ b/god/streams/README.md
@@ -0,0 +1,38 @@
+# streams done right(tm)
+
+There are numerous ways to start streams ( make your computer or some server 
+output streamed audio). Currently implemented are:
+
+# Streams Modules
+1. pure streams  - will start mpd on your local machine
+2. mpdstreams    - will use a given mpd server to start a stream
+3. relaxxstreams - will contact the relaxxplayer (mpd front-end) if the direct 
+                   connection to the mpd is prohibited by firewall rules
+# Database
+Currently there are a number of possible streams saved in the database files
+which contain of a link, a space, and the name of the stream. the database 
+can be found in db/ .
+
+Currently there are two kinds of databases:
+1. streams.db - contains links to playlists of streams
+2. direct.db  - contains links directly to the stream, not the playlist
+
+to generate direct.db from a list of playlists use the helper/* scripts
+
+# initscripts
+
+the most convenient way to start streams is to use stream-starter which is 
+a script which, when symlinked with a name of a stream, invokes the streams
+tool with its own name as parameter.
+
+An example:
+
+    ln -s /krebs/god/streams/bin/stream-starter /etc/init.d/groove
+    /etc/init.d/groove start
+
+# Remarks
+deepmix,groovesalad and radiotux are now init.d scrips which can be
+started and stopped.
+
+scripts are dumped into /etc/init.d and groovesalad will be set as
+default via update-rc.d
diff --git a/god/streams/bin/helper/streamfind b/god/streams/bin/helper/streamfind
new file mode 100644
index 00000000..32b84a4e
--- /dev/null
+++ b/god/streams/bin/helper/streamfind
@@ -0,0 +1,10 @@
+#!/bin/sh
+cat stream.db | while read url name;do
+    curl $url --max-time 1 2>/dev/null| sed -n 's/[fF]ile[0-9]=\(.*\)/\1/p' > "streamfinder/$name"
+    if [ "x`cat \"streamfinder/$name\"`" == "x" ];then
+        rm "streamfinder/$name"
+        echo "$name empty or not a stream"
+    else
+        echo "wrote $name"
+    fi
+done
diff --git a/god/streams/bin/helper/streamwrite b/god/streams/bin/helper/streamwrite
new file mode 100644
index 00000000..a10fb155
--- /dev/null
+++ b/god/streams/bin/helper/streamwrite
@@ -0,0 +1,6 @@
+for i in `ls -1 streamfinder/`;
+do
+    for j in `cat "$i"`;do
+        echo "$j $i" >> direct.db
+    done
+done
diff --git a/god/streams/bin/mpdstreams b/god/streams/bin/mpdstreams
new file mode 100755
index 00000000..a2a5f77c
--- /dev/null
+++ b/god/streams/bin/mpdstreams
@@ -0,0 +1,113 @@
+#!/usr/bin/python2
+
+# this version cannot tell if a stream is running or just ordinary music
+import os
+import sys
+from subprocess import Popen, PIPE
+
+os.chdir(os.path.dirname(os.path.realpath(sys.argv[0])))
+pidfile = "/tmp/krebs.stream.pid"
+host="lounge.mpd.shack"
+url_file = os.environ.get("STREAM_DB", "../db/stream.db")
+urls = []
+for line in open(url_file):
+    urls.append(line.split())
+#print urls
+mybin = sys.argv[0]
+cmd = sys.argv[1] if len(sys.argv) > 1 else "you-are-made-of-stupid"
+stream = sys.argv[2] if len(sys.argv) == 3 else "groove"
+pipe_silent = open("/dev/null","w")
+
+def urlForStream(stream):
+    for url, s in urls:
+        if s == stream:
+            return url
+
+def streamForUrl(url):
+    for u, s in urls:
+        if u == url:
+            return stream 
+
+def startStream(stream_url):
+    Popen(["mpc","--host",host,"crossfade","5"],
+            stdout=pipe_silent,stderr=pipe_silent)
+    Popen(["mpc","--host",host,"repeat","yes"],
+            stdout=pipe_silent,stderr=pipe_silent)
+    Popen(["mpc","--host",host,"clear"],
+            stdout=pipe_silent,stderr=pipe_silent)
+    Popen(["mpc","--host",host,"add",stream_url],
+            stdout=pipe_silent,stderr=pipe_silent).wait()
+    Popen(["mpc","--host",host,"play"],
+            stdout=pipe_silent,stderr=pipe_silent)
+
+def start(stream):
+    ret = running()
+    if ret:
+        print "!! Stream `%s` already running !" % \
+                (ret)
+    else:
+        startStream(urlForStream(stream))
+        print "** Starting `%s`."% stream
+
+
+def stop():
+    ret = running()
+    if not ret:
+        print "!! No Stream running!"
+    else:
+        print "** Stopping `%s`" % ret
+        Popen(["mpc","--host",host,"stop"],
+            stdout=pipe_silent,stderr=pipe_silent)
+        
+
+def running():
+    try:
+        (out,err) = Popen(["mpc","--host",host,"current"],stdout=PIPE,stderr=PIPE).communicate()
+        out = out.rstrip()
+        return out
+    except Exception as e:
+        return ""
+
+
+def slist():
+    for url, name in urls:
+        print "%s : %s" % (name, url)
+
+
+def shorthelp():
+    print "start|stop|restart|status|list [audio stream]"
+
+
+def longhelp():
+    print "Usage: %s" % mybin,
+    shorthelp
+    print """ get all available streams with '/%(fil)s list'
+    Examples:
+    %(fil)s list
+    %(fil)s start groove
+    %(fil)s switch deepmix
+    %(fil)s status
+    %(fil)s stop""" % {'fil': mybin}
+
+if cmd == "start":
+    start(stream)
+elif cmd == "stop":
+    stop()
+elif cmd == "switch" or cmd == "restart":
+    stop()
+    start(stream)
+elif cmd == "status":
+    ret = running()
+    if not ret:
+        print "** nothing running"  # , e
+    else:
+        print "Now Playing: %s" % ret
+elif cmd == "list":
+    slist()
+elif cmd == "--help":
+    longhelp()
+elif cmd == "-h":
+    shorthelp()
+else:
+    print "unknown command `%s`" % cmd
+    print "try `%s` --help" % os.path.basename(mybin)
diff --git a/god/streams/bin/relaxxapi.py b/god/streams/bin/relaxxapi.py
new file mode 100755
index 00000000..f367caef
--- /dev/null
+++ b/god/streams/bin/relaxxapi.py
@@ -0,0 +1,140 @@
+#!/usr/bin/python2
+import json
+from urllib import quote
+class relaxx:
+
+    def __init__(self,relaxxurl="http://lounge.mpd.shack/"):
+        self.baseurl=relaxxurl
+        import requests
+        ret = requests.get(relaxxurl) # grab cookie
+        try:
+            self.r = requests.session(cookies=ret.cookies,headers={"Referer":relaxxurl})
+        except:
+            print ("you are missing the `requests` dependency, please do a `pip install requests`")
+    def _status(self,value=0,data="json=null"):
+        """
+        value is some weird current playlist value, 0 seems to work
+        data is url encoded kv-store
+        """
+        # TODO get the current playlist value
+        url=self.baseurl+"include/controller-ping.php?value=%s"%value
+        return self.r.post(url,data="json=null").text
+
+    def _playlist(self,action,value="",json="null",method="get"):
+        """
+        This function is the interface to the controller-playlist api
+            use it if you dare
+        Possible actions:
+            clear
+            addSong url_encoded_path
+            moveSong 1:2
+            getPlaylists
+            getPlaylistInfo 1
+            listPlaylistInfo
+        as everything seems to be a get request, the method is set to GET as
+        default
+        """
+        url=self.baseurl+"include/controller-playlist.php?action=%s&value=%s&json=%s"%(action,value,json)
+        if method== "get":
+            return self.r.get(url).text
+        elif method == "post":
+            return r.post(url).text
+        else:
+            raise Exception("unknown method %s")
+
+    def _playback(self,action,value="",json="null",method="get"):
+        """
+        play
+        continue
+        stop
+        setCrossfade
+        """
+        url=self.baseurl+"include/controller-playback.php?action=%s&value=%s&json=%s"%(action,value,json)
+        # probably obsolete because everything is "get"
+        if method== "get":
+            return self.r.get(url).text
+        elif method == "post":
+            return r.post(url).text
+        else:
+            raise Exception("unknown method %s")
+
+    def _radio(self,playlist=""):
+        """
+        both, post and get the url seem to work here...
+        """
+        url=self.baseurl+"include/controller-netradio.php?playlist=%s"%quote(playlist)
+        return self.r.get(url).text
+
+    def add_radio(self,playlist=""):
+        print playlist
+        print self._radio(playlist)
+        print json.loads(self._radio(playlist)) #[1:-1])["url"]
+        resolved_url= json.loads(self._radio(playlist)[1:-1])["url"]
+        self.add_song(resolved_url)
+
+    def add_song(self,path):
+        return self._playlist("addSong",path)
+
+    def get_first(self):
+        return json.loads(self._playlist("getPlaylistInfo","0",""))[0]
+
+    def get_first(self):
+        return json.loads(self._playlist("getPlaylistInfo","0",""))[-1]
+
+    def clear(self):
+        return self._playlist("clear")
+    
+    def crossfade(self,ident="0"):
+        """
+        default: no crossfade
+        """
+        return self._playback("setCrossfade",ident)
+
+    def repeat(self,ident="1"):
+        """
+        default: do repeat
+        """
+        return self._playback("repeat",ident)
+
+    def play(self,ident):
+        return self._playback("play",ident)
+
+    def stop(self):
+        return self._playback("stop")
+
+    def cont(self,ident):
+        return self._playback("continue",ident)
+
+    def play_first(self):
+        return self.play(self.get_first()["Id"])
+
+    def play_last(self):
+        return self.play(self.get_last()["Id"])
+
+    def state(self):
+        return json.loads(self._status())
+
+    def is_running(self):
+        return self.state()["status"]["state"] == "play"
+
+    def playing(self):
+        """ returns "" if not running
+        """
+        state = self.state()
+        if state["status"]["state"] == "play" :
+            ident = state["status"]["song"]
+            current = state["playlist"]["file"][int(ident)]
+            return current.get("Name",current.get("Artist")) + " - " + current["Title"]
+        else:
+            return ""
+
+if __name__ == "__main__":
+    r = relaxx()
+    print r.state()
+    print r.playing()
+    print r.add_radio("http://deluxetelevision.com/livestreams/radio/DELUXE_RADIO.pls")
+    #print r.clear()
+    #print r.add_radio("http://somafm.com/lush.pls")
+    #print r.get_first()["Id"]
+    #print r.play_first()
+    #print r.add_radio("http://somafm.com/lush.pls")
diff --git a/god/streams/bin/relaxxstreams b/god/streams/bin/relaxxstreams
new file mode 100755
index 00000000..0d3813a7
--- /dev/null
+++ b/god/streams/bin/relaxxstreams
@@ -0,0 +1,107 @@
+#!/usr/bin/python2
+
+# this version cannot tell if a stream is running or just ordinary music
+import os
+import sys
+import json
+from urllib import quote
+from relaxxapi import relaxx 
+
+try:
+    import requests
+except:
+    print ("you are missing the `requests` dependency, please do a `pip install requests`")
+from subprocess import Popen, PIPE
+
+os.chdir(os.path.dirname(os.path.realpath(sys.argv[0])))
+pidfile = "/tmp/krebs.stream.pid"
+baseurl="http://lounge.mpd.shack/"
+url=baseurl+"include/controller-playlist.php?action=%s&value=%s&json=%s"
+url_file = os.environ.get("STREAM_DB", "../db/direct.db")
+urls = []
+
+for line in open(url_file):
+    urls.append(line.split())
+#print urls
+mybin = sys.argv[0]
+cmd = sys.argv[1] if len(sys.argv) > 1 else "you-are-made-of-stupid"
+stream = sys.argv[2] if len(sys.argv) == 3 else "groove"
+pipe_silent = open("/dev/null","w")
+api = relaxx(baseurl)
+
+def urlForStream(stream):
+    for url, s in urls:
+        if s == stream:
+            return url
+
+def streamForUrl(url):
+    for u, s in urls:
+        if u == url:
+            return stream 
+
+def startStream(stream_url):
+    print api.crossfade("5")
+    print api.repeat("1")
+    print api.clear()
+    print api.add_song(stream_url)
+    print api.play_first()
+
+def start(stream):
+    ret = api.playing()
+    if ret:
+        print "!! Stream `%s` already running !" % \
+                (ret)
+    else:
+        startStream(urlForStream(stream))
+        print "** Starting `%s`."% stream
+
+
+def stop():
+    ret = api.playing()
+    if not ret:
+        print "!! No Stream running!"
+    else:
+        print "** Stopping `%s`" % ret
+        api.stop()
+
+def slist():
+    for url, name in urls:
+        print "%s : %s" % (name, url)
+
+def shorthelp():
+    print "start|stop|restart|status|list [audio stream]"
+
+
+def longhelp():
+    print "Usage: %s" % mybin,
+    shorthelp
+    print """ get all available streams with '/%(fil)s list'
+    Examples:
+    %(fil)s list
+    %(fil)s start groove
+    %(fil)s switch deepmix
+    %(fil)s status
+    %(fil)s stop""" % {'fil': mybin}
+
+if cmd == "start":
+    start(stream)
+elif cmd == "stop":
+    stop()
+elif cmd == "switch" or cmd == "restart":
+    stop()
+    start(stream)
+elif cmd == "status":
+    ret = api.playing()
+    if not ret:
+        print "** nothing running"  # , e
+    else:
+        print "Now Playing: %s" % ret
+elif cmd == "list":
+    slist()
+elif cmd == "--help":
+    longhelp()
+elif cmd == "-h":
+    shorthelp()
+else:
+    print "unknown command `%s`" % cmd
+    print "try `%s` --help" % os.path.basename(mybin)
diff --git a/god/streams/bin/stream-starter b/god/streams/bin/stream-starter
new file mode 100755
index 00000000..4d3a406f
--- /dev/null
+++ b/god/streams/bin/stream-starter
@@ -0,0 +1,19 @@
+#! /bin/bash
+set -euf
+HERE=$(dirname $(readlink -f $0))
+STR=$HERE/streams
+NAME=`basename $0`
+case "$1" in
+  start)
+    $STR start $NAME
+    ;;
+  stop)
+    $STR stop
+    ;;
+  restart)
+    $STR restart $NAME
+    ;;
+  *)
+    echo "aidsballs"
+  ;;
+esac
diff --git a/god/streams/bin/streams b/god/streams/bin/streams
new file mode 100755
index 00000000..ea6e9a90
--- /dev/null
+++ b/god/streams/bin/streams
@@ -0,0 +1,116 @@
+#!/usr/bin/python
+import os
+import sys
+from subprocess import Popen, PIPE
+
+os.chdir(os.path.dirname(os.path.realpath(sys.argv[0])))
+pidfile = "/tmp/krebs.stream.pid"
+url_file = os.environ.get("STREAM_DB", "../db/stream.db")
+urls = []
+#urls = [ url,f for (url,f) in open(url_file).readline() ]
+for line in open(url_file):
+    urls.append(line.split())
+#print urls
+mybin = sys.argv[0]
+cmd = sys.argv[1] if len(sys.argv) > 1 else "you-are-made-of-stupid"
+stream = sys.argv[2] if len(sys.argv) == 3 else "groove"
+
+
+def check_pid(pid):
+    """ Check For the existence of a unix pid. """
+    try:
+        os.kill(pid, 0)
+    except OSError:
+        return False
+    else:
+        return True
+
+
+def urlForStream(stream):
+    for url, s in urls:
+        if s == stream:
+            return url
+
+
+def start(stream):
+    ret = running()
+    if ret:
+        print "!! Stream `%s` already running with pid `%s` !" % \
+                (ret[1], ret[0])
+    else:
+        pipe_silent = open('/dev/null', 'w')
+        url = urlForStream(stream)
+        mpl = Popen(["mplayer", url],
+                 stdout=pipe_silent, stderr=pipe_silent).pid
+        print >> open(pidfile, "w+"), "%d %s" % (mpl, stream)
+
+
+def stop():
+    ret = running()
+    if not ret:
+        print "!! No Stream running!"
+    else:
+        pid, name = ret
+        print "** Killing `%s` with pid %s" % (name, pid)
+        os.kill(int(pid), 15)
+        #if check_pid(int(pid)):
+        #    print "!! trying harder to kill process"
+        #    os.kill(int(pid), 9)
+        os.remove(pidfile)
+
+
+def running():
+    try:
+        pid, currstream = open(pidfile).read().split()
+        if check_pid(int(pid)):
+            return (pid, currstream)
+        else:
+            print "!! removing stale pidfile"
+            os.remove(pidfile)
+            raise Exception("Pidfile stale")
+    except Exception as e:
+        return ()
+
+
+def slist():
+    for url, name in urls:
+        print "%s : %s" % (name, url)
+
+
+def shorthelp():
+    print "start|stop|restart|status|list [audio stream]"
+
+
+def longhelp():
+    print "Usage: %s" % mybin,
+    shorthelp
+    print """ get all available streams with '/%(fil)s list'
+    Examples:
+    %(fil)s list
+    %(fil)s start groove
+    %(fil)s switch deepmix
+    %(fil)s status
+    %(fil)s stop""" % {'fil': mybin}
+
+if cmd == "start":
+    start(stream)
+elif cmd == "stop":
+    stop()
+elif cmd == "switch" or cmd == "restart":
+    stop()
+    start(stream)
+elif cmd == "status":
+    ret = running()
+    if not ret:
+        print "** no stream running"  # , e
+    else:
+        print "%s is running(%s)" % (ret[1], urlForStream(ret[1]))
+elif cmd == "list":
+    slist()
+elif cmd == "--help":
+    longhelp()
+elif cmd == "-h":
+    shorthelp()
+else:
+    print "unknown command `%s`" % cmd
+    print "try `%s` --help" % os.path.basename(mybin)
diff --git a/god/streams/db/direct.db b/god/streams/db/direct.db
new file mode 100644
index 00000000..02da4608
--- /dev/null
+++ b/god/streams/db/direct.db
@@ -0,0 +1,78 @@
+http://ice.somafm.com/groovesalad groove
+http://ice.somafm.com/u80s underground80s
+http://de.scenemusic.net/necta192.mp3 demoscene
+http://radio.krautchan.net:8000/radio.mp3 radiofreieskrautchan
+http://stream2.jungletrain.net:8000 jungletrain
+http://streams.xenim.de/radiotux.ogg radiotux
+http://localhost:8000/stream.ogg icecast
+http://localhost:8000/shice.ogg shice
+http://sfstream1.somafm.com:9090 480min
+http://mp1.somafm.com:8080 480min
+http://ice.somafm.com/480min 480min
+http://shouthostdirect11.streams.bassdrive.com:8398 bassdrive
+http://sanjose1.serverhostingcenter.streams.bassdrive.com:8600 bassdrive
+http://arces.net.streams.bassdrive.com:8000 bassdrive
+http://amsterdam1.serverhostingcenter.streams.bassdrive.com:8000 bassdrive
+http://shouthostdirect10.streams.bassdrive.com:8200 bassdrive
+http://shouthostdirect13.streams.bassdrive.com:8202 bassdrive
+http://czech1.serverhostingcenter.streams.bassdrive.com:8200 bassdrive
+http://shouthostdirect12.streams.bassdrive.com:8200 bassdrive
+http://beezle.streams.bassdrive.com:8765 bassdrive
+http://sfstream1.somafm.com:8384 beatblender
+http://sfstream1.somafm.com:8388 beatblender
+http://ice.somafm.com/beatblender beatblender
+http://sfstream1.somafm.com:8040 blackrockfm
+http://ice.somafm.com/brfm blackrockfm
+http://sfstream1.somafm.com:7000 bootliquor
+http://207.200.96.230:8014 bootliquor
+http://mp1.somafm.com:9004 bootliquor
+http://ice.somafm.com/bootliquor bootliquor
+http://sfstream1.somafm.com:8062 cliqhop
+http://mp2.somafm.com:2668 cliqhop
+http://ice.somafm.com/cliqhop cliqhop
+http://sfstream1.somafm.com:8700 covers
+http://ice.somafm.com/covers covers
+http://85.21.79.93:8040 deepmix
+http://212.7.194.133:8128 deepmix
+http://85.21.79.31:7128 deepmix
+http://69.163.134.109:8128 deepmix
+http://194.183.224.59:8128 deepmix
+http://radio.cdn.deluxemusic.tv/deluxemusic.tv/radio_web/mp3 deluxe
+http://sfstream1.somafm.com:8900 digitalis
+http://ice.somafm.com/digitalis digitalis
+http://205.234.246.42:8300 doomed
+http://sfstream1.somafm.com:8300 doomed
+http://ice.somafm.com/doomed doomed
+http://streamer-dtc-aa01.somafm.com:80/stream/1032 dronezone
+http://sfstream1.somafm.com:8014 dronezone
+http://mp2.somafm.com:8002 dronezone
+http://ice.somafm.com/dronezone dronezone
+http://sfstream1.somafm.com:8500 illstreet
+http://ice.somafm.com/illstreet illstreet
+http://sfstream1.somafm.com:8090 indypop
+http://ice.somafm.com/indiepop indypop
+http://sfstream1.somafm.com:8800 lush
+http://mp1.somafm.com:8800 lush
+http://ice.somafm.com/lush lush
+http://sfstream1.somafm.com:2020 missioncontrol
+http://mp1.somafm.com:2020 missioncontrol
+http://ice.somafm.com/missioncontrol missioncontrol
+http://sfstream1.somafm.com:2200 poptron
+http://ice.somafm.com/poptron poptron
+http://sfstream1.somafm.com:8002 secretagent
+http://mp2.somafm.com:9016 secretagent
+http://ice.somafm.com/secretagent secretagent
+http://sfstream1.somafm.com:8600 sonicuniverse
+http://mp2.somafm.com:8600 sonicuniverse
+http://ice.somafm.com/sonicuniverse sonicuniverse
+http://mp2.somafm.com:5400 southbysoma
+http://ice.somafm.com/sxfm southbysoma
+http://sfstream1.somafm.com:8000 spacestationsoma
+http://mp2.somafm.com:2666 spacestationsoma
+http://ice.somafm.com/spacestation spacestationsoma
+http://sfstream1.somafm.com:8850 suburbsofgoa
+http://ice.somafm.com/suburbsofgoa suburbsofgoa
+http://205.188.215.230:8010 tagstrip
+http://ice.somafm.com/tags tagstrip
+http://sfstream1.somafm.com:8880 underground80s
+http://ice.somafm.com/u80s underground80s
diff --git a/god/streams/db/stream.db b/god/streams/db/stream.db
new file mode 100644
index 00000000..1d9b51bc
--- /dev/null
+++ b/god/streams/db/stream.db
@@ -0,0 +1,35 @@
+http://deepmix.ru/deepmix128.pls deepmix
+http://streams.xenim.de/radiotux.ogg radiotux
+http://bassdrive.com/v2/streams/BassDrive.pls bassdrive
+http://localhost:8000/stream.ogg icecast
+http://localhost:8000/shice.ogg shice
+http://stream2.jungletrain.net:8000 jungletrain
+http://playlist.tormentedradio.com/tormentedradio.pls tormented
+http://filebitch.shack:8000 mpd
+http://radio.krautchan.net:8000/radio.mp3 radiofreieskrautchan
+http://nl1.streamhosting.ch:80 lounge
+http://deluxetelevision.com/livestreams/radio/DELUXE_RADIO.pls deluxe
+http://livestream.radiodarmstadt.de:8000 darmstadt
+http://somafm.com/sxfm.pls southbysoma
+http://somafm.com/indiepop.pls indypop
+http://somafm.com/poptron.pls poptron
+http://somafm.com/480min.pls 480min
+http://somafm.com/u80s.pls underground80s
+http://somafm.com/secretagent.pls secretagent
+http://somafm.com/suburbsofgoa.pls suburbsofgoa
+http://somafm.com/beatblender.pls beatblender
+http://somafm.com/missioncontrol.pls missioncontrol
+http://somafm.com/dronezone.pls dronezone
+http://somafm.com/cliqhop.pls cliqhop
+http://somafm.com/spacestation.pls spacestationsoma
+http://somafm.com/bootliquor.pls bootliquor
+http://somafm.com/covers.pls covers
+http://somafm.com/illstreet.pls illstreet
+http://somafm.com/tags.pls tagstrip
+http://somafm.com/groovesalad.pls groove
+http://somafm.com/lush.pls lush
+http://somafm.com/digitalis.pls digitalis
+http://somafm.com/sonicuniverse.pls sonicuniverse
+http://somafm.com/doomed.pls doomed
+http://somafm.com/brfm.pls blackrockfm
+http://de.scenemusic.net/necta192.mp3 demoscene
diff --git a/god/streams/doc/relaxxplayer.api b/god/streams/doc/relaxxplayer.api
new file mode 100644
index 00000000..50d25af2
--- /dev/null
+++ b/god/streams/doc/relaxxplayer.api
@@ -0,0 +1,13 @@
+http://lounge.mpd.shack/include/controller-playback.php?action=setCrossfade&value=5&json=null
+http://lounge.mpd.shack/include/controller-playback.php?action=repeat&value=1&json=null
+http://lounge.mpd.shack/include/controller-playlist.php?action=clear&value=&json=null
+http://lounge.mpd.shack/include/controller-playlist.php?action=addSong&value=http%3A%2F%2F212.7.194.133%3A8128&json=null
+http://lounge.mpd.shack/include/controller-playlist.php?action=getPlaylistInfo&value=0&json=
+[{                                                                 
+  "file": "http:\/\/212.7.194.133:8128",
+  "Title": "Max & Dima - Sapovnela Studio: Batut",
+  "Name": "Deep Mix Moscow Radio: deepmix.ru",
+  "Pos": "0",
+  "Id": "606"
+}] 
+http://lounge.mpd.shack/include/controller-playlist.php?action=continue&value={Id}&json=null