summaryrefslogtreecommitdiffstats
path: root/streams
diff options
context:
space:
mode:
authortv <tv@also>2011-08-08 00:53:00 +0200
committertv <tv@also>2011-08-08 00:53:00 +0200
commit6dd9ea309f4fc010b113b357a5d2f65ef0977aa3 (patch)
tree6ef5ae5b536f72ffffe25dcbc94261dcb45449b0 /streams
parent04fea470969698c9587e4fe04e1e42cfaf703b9a (diff)
parentd28012696a16e7d0fa3cf20e3527b9cf5747dc3a (diff)
Merge branch 'master' of github.com:krebscode/painload
Diffstat (limited to 'streams')
-rw-r--r--streams/stream.db1
-rwxr-xr-xstreams/streams2
2 files changed, 2 insertions, 1 deletions
diff --git a/streams/stream.db b/streams/stream.db
index 6ca9a627..e97a202e 100644
--- a/streams/stream.db
+++ b/streams/stream.db
@@ -3,3 +3,4 @@ http://deepmix.ru/deepmix128.pls deepmix
http://streams.xenim.de/radiotux.ogg radiotux
http://bassdrive.com/v2/streams/BassDrive.pls bassdrive
http://somafm.com/illstreet.pls illstreet
+http://localhost:8000/stream.ogg icecast
diff --git a/streams/streams b/streams/streams
index 607fd9e5..60a4bfc2 100755
--- a/streams/streams
+++ b/streams/streams
@@ -22,7 +22,7 @@ function start() {
if echo "$URLS" | while read URL NAME; do
if [ "$NAME" = "$REQ" ];then
- tmux new-session -s streams -n streams -d "exec mplayer $URL"
+ tmux new-session -s streams -n streams -d "while sleep 1;do mplayer $URL;done"
echo "** $REQ started"
exit 1
fi