From b4d2a84c6d96c7b6bee603680099fb5c38b4bb22 Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 3 Aug 2011 23:55:36 +0200 Subject: finished protype of streams streams/streams: runs given streams by name with zsh start|stop|restart|status|list [streamname] the Makefile has yet to be fixed for that one streams/groove: uses streams to start|stop|restart groovesalad stream --- streams/groove | 19 +++------------ streams/streams | 76 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 80 insertions(+), 15 deletions(-) create mode 100755 streams/streams (limited to 'streams') diff --git a/streams/groove b/streams/groove index 935a16d9..8c2faddd 100755 --- a/streams/groove +++ b/streams/groove @@ -1,25 +1,14 @@ #! /bin/bash set -euf -CMD="exec mplayer http://somafm.com/groovesalad.pls" -function start() { - stop - tmux start-server - tmux new-session -d "$CMD" -} -function stop() -{ - pkill mplayer || : -} - +STR=$PWD/streams case "$1" in start) - start + $STR start groove stop) - stop + $STR stop ;; restart) - stop - start + $STR restart groove ;; *) echo "aidsballs" diff --git a/streams/streams b/streams/streams new file mode 100755 index 00000000..f3cbc300 --- /dev/null +++ b/streams/streams @@ -0,0 +1,76 @@ +#! /bin/sh +URLS="http://somafm.com/groovesalad.pls groove +http://deepmix.ru/deepmix128.pls deepmix +http://streams.xenim.de/radiotux.ogg radiotux" + +function start() { + # start the given stream von $1 + REQ=$1 + tmux start-server + if status; then + echo "!! Stream already running!" + exit 1 + fi + + if echo "$URLS" | while read URL NAME; do + if [ "$NAME" = "$REQ" ];then + tmux new-session -s streams -n streams -d "exec mplayer $URL" + echo "** $REQ started" + exit 1 + fi + done; then + echo "!! Stream not found!" + exit 1 + fi +} +function stop() +{ + #stops every stream + tmux kill-session -t streams || echo "!! killing session failed" +} + +function status() +{ + tmux has-session -t streams 2>/dev/null + RET=$? + tmux list-sessions 2>/dev/null + return $RET +} +function list() +{ + echo "$URLS" | while read URL NAME ; do + echo "$NAME : $URL" + done + +} + + + + +case "$1" in + start) + start $2 + ;; + stop) + stop + ;; + restart) + stop + start $2 + ;; + status) + if status; then + echo "** stream running" + exit 0 + else + echo "** Stream not running" + exit 1 + fi + ;; + list) + list + ;; + *) + echo "aidsballs" + ;; +esac -- cgit v1.2.3 From 414fce9d9e944760139bca142dfda272e7642233 Mon Sep 17 00:00:00 2001 From: makefu Date: Thu, 4 Aug 2011 00:04:03 +0200 Subject: streams/ fixed starter script for streams all stream starter scripts are now symlinks. streams now is able to list all implemented streams --- streams/deepmix | 27 +-------------------------- streams/groove | 17 +---------------- streams/radiotux | 30 +----------------------------- streams/stream-starter | 18 ++++++++++++++++++ streams/streams | 2 +- 5 files changed, 22 insertions(+), 72 deletions(-) mode change 100755 => 120000 streams/deepmix mode change 100755 => 120000 streams/groove mode change 100755 => 120000 streams/radiotux create mode 100755 streams/stream-starter (limited to 'streams') diff --git a/streams/deepmix b/streams/deepmix deleted file mode 100755 index b8f8fba8..00000000 --- a/streams/deepmix +++ /dev/null @@ -1,26 +0,0 @@ -#! /bin/bash -set -euf -CMD="mplayer http://deepmix.ru/deepmix128.pls" -function start() { - stop - tmux start-server - tmux new-session -d "$CMD" -} -function stop() { - pkill mplayer || : -} -case "$1" in - start) - start - ;; - stop) - stop - ;; - restart) - stop - start - ;; - *) - echo "aidsballs" - ;; -esac diff --git a/streams/deepmix b/streams/deepmix new file mode 120000 index 00000000..b0148d72 --- /dev/null +++ b/streams/deepmix @@ -0,0 +1 @@ +stream-starter \ No newline at end of file diff --git a/streams/groove b/streams/groove deleted file mode 100755 index 8c2faddd..00000000 --- a/streams/groove +++ /dev/null @@ -1,16 +0,0 @@ -#! /bin/bash -set -euf -STR=$PWD/streams -case "$1" in - start) - $STR start groove - stop) - $STR stop - ;; - restart) - $STR restart groove - ;; - *) - echo "aidsballs" - ;; -esac diff --git a/streams/groove b/streams/groove new file mode 120000 index 00000000..b0148d72 --- /dev/null +++ b/streams/groove @@ -0,0 +1 @@ +stream-starter \ No newline at end of file diff --git a/streams/radiotux b/streams/radiotux deleted file mode 100755 index 9d671493..00000000 --- a/streams/radiotux +++ /dev/null @@ -1,29 +0,0 @@ -#! /bin/bash -set -euf -function stop() -{ - pkill mplayer || true -} - -CMD="while true; do exec mplayer http://streams.xenim.de/radiotux.ogg; sleep 1;done" -case "$1" in - start) - stop - if tmux list-sessions; - then - tmux new-window "$CMD" & - else - tmux new-session "$CMD" & - fi - ;; - stop) - stop - ;; - restart) - stop - start - ;; - *) - echo "aidsballs" - ;; -esac diff --git a/streams/radiotux b/streams/radiotux new file mode 120000 index 00000000..b0148d72 --- /dev/null +++ b/streams/radiotux @@ -0,0 +1 @@ +stream-starter \ No newline at end of file diff --git a/streams/stream-starter b/streams/stream-starter new file mode 100755 index 00000000..8f6c6a9d --- /dev/null +++ b/streams/stream-starter @@ -0,0 +1,18 @@ +#! /bin/bash +set -euf +STR=$PWD/streams +NAME=`basename $0` +case "$1" in + start) + $STR start $NAME + ;; + stop) + $STR stop + ;; + restart) + $STR restart $NAME + ;; + *) + echo "aidsballs" + ;; +esac diff --git a/streams/streams b/streams/streams index f3cbc300..01097aea 100755 --- a/streams/streams +++ b/streams/streams @@ -19,7 +19,7 @@ function start() { exit 1 fi done; then - echo "!! Stream not found!" + echo "!! Stream '$REQ' not found!" exit 1 fi } -- cgit v1.2.3 From ab14e45883fd46a5f083ac95ae2293d16e90001e Mon Sep 17 00:00:00 2001 From: makefu Date: Thu, 4 Aug 2011 00:36:12 +0200 Subject: streams/* updated Makefile/stream now in file Makefile: now creates symlinks to the krebs folder stream.db: streams are stored in a file --- streams/Makefile | 9 ++++++--- streams/stream-starter | 3 ++- streams/stream.db | 3 +++ streams/streams | 5 ++--- 4 files changed, 13 insertions(+), 7 deletions(-) create mode 100644 streams/stream.db (limited to 'streams') diff --git a/streams/Makefile b/streams/Makefile index 9f3076c0..dcf1ca45 100644 --- a/streams/Makefile +++ b/streams/Makefile @@ -1,10 +1,13 @@ -INITD = /etc/init.d/ +#INITD = /etc/init.d/ +INITD = /etc/rc.d/ streams = groove deepmix radiotux +CURRDIR = ${PWD} .PHONY: all .PHONY: $(streams) all: $(streams) - update-rc.d groove defaults + @update-rc.d groove defaults 2>/dev/null || echo "** put groove daemon in DAEMONS in /etc/rc.conf" + $(streams): - cp $@ $(INITD)$@ + ln -n -s -f $$PWD/stream-starter $(INITD)$@ diff --git a/streams/stream-starter b/streams/stream-starter index 8f6c6a9d..cfcf91d4 100755 --- a/streams/stream-starter +++ b/streams/stream-starter @@ -1,6 +1,7 @@ #! /bin/bash set -euf -STR=$PWD/streams +HERE=`readlink -f $(dirname $0)` +STR=$HERE/streams NAME=`basename $0` case "$1" in start) diff --git a/streams/stream.db b/streams/stream.db new file mode 100644 index 00000000..168cc68d --- /dev/null +++ b/streams/stream.db @@ -0,0 +1,3 @@ +http://somafm.com/groovesalad.pls groove +http://deepmix.ru/deepmix128.pls deepmix +http://streams.xenim.de/radiotux.ogg radiotux diff --git a/streams/streams b/streams/streams index 01097aea..a2b5bee4 100755 --- a/streams/streams +++ b/streams/streams @@ -1,7 +1,6 @@ #! /bin/sh -URLS="http://somafm.com/groovesalad.pls groove -http://deepmix.ru/deepmix128.pls deepmix -http://streams.xenim.de/radiotux.ogg radiotux" +HERE=`readlink -f $(dirname $0)` +URLS=`cat $HERE/stream.db` function start() { # start the given stream von $1 -- cgit v1.2.3 From d67a6ef70f8d255fa7afa018286cdbd38ab56f83 Mon Sep 17 00:00:00 2001 From: makefu Date: Thu, 4 Aug 2011 01:11:10 +0200 Subject: streams/Makefile patched to be less stupid Makefile now has logic to find scripts to be installled and will not overwrite evevery script in your initd. --- streams/Makefile | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'streams') diff --git a/streams/Makefile b/streams/Makefile index dcf1ca45..0922e38f 100644 --- a/streams/Makefile +++ b/streams/Makefile @@ -1,13 +1,11 @@ -#INITD = /etc/init.d/ -INITD = /etc/rc.d/ -streams = groove deepmix radiotux +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 -.PHONY: $(streams) +.PHONY: all $(streams) all: $(streams) @update-rc.d groove defaults 2>/dev/null || echo "** put groove daemon in DAEMONS in /etc/rc.conf" - $(streams): - ln -n -s -f $$PWD/stream-starter $(INITD)$@ + @test -L $(INITD)$@ || test ! -e $(INITD)$@ && \ + ln -n -s -f $$PWD/stream-starter $(INITD)$@ && echo "writing $@ to $(INITD)" -- cgit v1.2.3 From e3e8a7e7d7d3210996187d88456d4d4b02116038 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 4 Aug 2011 01:05:51 +0200 Subject: streams/ fixed readlink fuckup in scripts --- streams/deepmix | 1 - streams/groove | 1 - streams/radiotux | 1 - streams/stream-starter | 2 +- streams/streams | 4 ++-- 5 files changed, 3 insertions(+), 6 deletions(-) delete mode 120000 streams/deepmix delete mode 120000 streams/groove delete mode 120000 streams/radiotux (limited to 'streams') diff --git a/streams/deepmix b/streams/deepmix deleted file mode 120000 index b0148d72..00000000 --- a/streams/deepmix +++ /dev/null @@ -1 +0,0 @@ -stream-starter \ No newline at end of file diff --git a/streams/groove b/streams/groove deleted file mode 120000 index b0148d72..00000000 --- a/streams/groove +++ /dev/null @@ -1 +0,0 @@ -stream-starter \ No newline at end of file diff --git a/streams/radiotux b/streams/radiotux deleted file mode 120000 index b0148d72..00000000 --- a/streams/radiotux +++ /dev/null @@ -1 +0,0 @@ -stream-starter \ No newline at end of file diff --git a/streams/stream-starter b/streams/stream-starter index cfcf91d4..4d3a406f 100755 --- a/streams/stream-starter +++ b/streams/stream-starter @@ -1,6 +1,6 @@ #! /bin/bash set -euf -HERE=`readlink -f $(dirname $0)` +HERE=$(dirname $(readlink -f $0)) STR=$HERE/streams NAME=`basename $0` case "$1" in diff --git a/streams/streams b/streams/streams index a2b5bee4..a8408b4a 100755 --- a/streams/streams +++ b/streams/streams @@ -1,5 +1,5 @@ -#! /bin/sh -HERE=`readlink -f $(dirname $0)` +#! /bin/bash +HERE=$(dirname $(readlink -f $0)) URLS=`cat $HERE/stream.db` function start() { -- cgit v1.2.3 From 52cdc1f60bde3a542cd14b5aa7b9c6441f0ca166 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 4 Aug 2011 01:19:58 +0200 Subject: added bassdrive --- streams/stream.db | 1 + 1 file changed, 1 insertion(+) (limited to 'streams') diff --git a/streams/stream.db b/streams/stream.db index 168cc68d..484abaad 100644 --- a/streams/stream.db +++ b/streams/stream.db @@ -1,3 +1,4 @@ http://somafm.com/groovesalad.pls groove http://deepmix.ru/deepmix128.pls deepmix http://streams.xenim.de/radiotux.ogg radiotux +http://bassdrive.com/v2/streams/BassDrive.pls bassdrive -- cgit v1.2.3 From 1af1a0d5634df838d58aeec32905ef8208811fa2 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 4 Aug 2011 02:32:37 +0200 Subject: added help for streams tool --- streams/streams | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) (limited to 'streams') diff --git a/streams/streams b/streams/streams index a8408b4a..eb1e6674 100755 --- a/streams/streams +++ b/streams/streams @@ -2,6 +2,11 @@ HERE=$(dirname $(readlink -f $0)) URLS=`cat $HERE/stream.db` +#if [ ! `id -u` -eq "0" ]; then +# echo "we are going sudo..." +# exec sudo "$0" "$@" +#fi + function start() { # start the given stream von $1 REQ=$1 @@ -43,7 +48,23 @@ function list() } - +function shorthelp() +{ + echo "start|stop|restart|status|list [audio stream]" +} +function longhelp() +{ + B=`basename $0` + echo -n "Usage: $B " + shorthelp + echo " get all available streams with '/$B list' +Examples: + $B list + $B start groove + $B restart deepmix + $B status + $B stop" +} case "$1" in @@ -69,7 +90,10 @@ case "$1" in list) list ;; + (--help) + shorthelp + ;; *) - echo "aidsballs" + longhelp ;; esac -- cgit v1.2.3 From e7083704d7ddd0c861eedc9dae29e8ccf5b805cd Mon Sep 17 00:00:00 2001 From: club-mate Date: Thu, 4 Aug 2011 16:24:51 +0200 Subject: streams: add illstreet --- streams/stream.db | 1 + 1 file changed, 1 insertion(+) (limited to 'streams') diff --git a/streams/stream.db b/streams/stream.db index 484abaad..6ca9a627 100644 --- a/streams/stream.db +++ b/streams/stream.db @@ -2,3 +2,4 @@ http://somafm.com/groovesalad.pls groove 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 -- cgit v1.2.3 From e8366c686a0ff53648472a6a692ba412dc0a6794 Mon Sep 17 00:00:00 2001 From: club-mate Date: Thu, 4 Aug 2011 16:24:51 +0200 Subject: streams: add illstreet --- streams/stream.db | 1 + 1 file changed, 1 insertion(+) (limited to 'streams') diff --git a/streams/stream.db b/streams/stream.db index 484abaad..6ca9a627 100644 --- a/streams/stream.db +++ b/streams/stream.db @@ -2,3 +2,4 @@ http://somafm.com/groovesalad.pls groove 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 -- cgit v1.2.3 From 9a6fdfae1cd58de6390991e559f29e93d4180f71 Mon Sep 17 00:00:00 2001 From: makefu Date: Thu, 4 Aug 2011 19:51:53 +0200 Subject: streams/streams fixed status added 'switch' command (same as restart) fixed stop, now telling which stream has been stopped status now tells which stream is running/ which url --- streams/streams | 51 +++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 37 insertions(+), 14 deletions(-) (limited to 'streams') diff --git a/streams/streams b/streams/streams index a8408b4a..034d68a1 100755 --- a/streams/streams +++ b/streams/streams @@ -1,12 +1,16 @@ #! /bin/bash HERE=$(dirname $(readlink -f $0)) URLS=`cat $HERE/stream.db` +CURRENT_STREAM="no stream" #will be set when calling `status` +if [ ! `id -u` -eq "0" ]; then + exec sudo "$0" "$@" +fi function start() { # start the given stream von $1 REQ=$1 tmux start-server - if status; then + if status &>/dev/null ; then echo "!! Stream already running!" exit 1 fi @@ -25,15 +29,39 @@ function start() { function stop() { #stops every stream - tmux kill-session -t streams || echo "!! killing session failed" + if status &>/dev/null; then + status | cut -d\ -f2 | xargs printf "** killing %s\n" + tmux kill-session -t streams 2>/dev/null || echo "!! killing session failed" + else + echo "** no stream running"; + return 1 + fi } function status() { - tmux has-session -t streams 2>/dev/null - RET=$? - tmux list-sessions 2>/dev/null - return $RET + #tmux has-session -t streams 2>/dev/null + #RET=$? + + #tmux list-sessions 2>/dev/null + #return $RET + EV="`ps -ef | grep tmux`" + if echo "$URLS" | while read URL NAME; do + if [ "`echo "$EV" | grep \"$URL\"`" ] ;then + echo "** $NAME running ($URL)" + exit 1 + fi + done; then + echo "** no stream running" + return 1 + else + return 0 + fi +} +function current() +{ + + return 1 } function list() { @@ -53,18 +81,13 @@ case "$1" in stop) stop ;; - restart) + (switch|restart) stop start $2 ;; status) - if status; then - echo "** stream running" - exit 0 - else - echo "** Stream not running" - exit 1 - fi + status + exit $? ;; list) list -- cgit v1.2.3 From e14c7902515b32ac454327cc621dba0f37bedf93 Mon Sep 17 00:00:00 2001 From: makefu Date: Thu, 4 Aug 2011 19:51:53 +0200 Subject: streams/streams fixed status added 'switch' command (same as restart) fixed stop, now telling which stream has been stopped status now tells which stream is running/ which url --- streams/streams | 51 +++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 37 insertions(+), 14 deletions(-) (limited to 'streams') diff --git a/streams/streams b/streams/streams index a8408b4a..034d68a1 100755 --- a/streams/streams +++ b/streams/streams @@ -1,12 +1,16 @@ #! /bin/bash HERE=$(dirname $(readlink -f $0)) URLS=`cat $HERE/stream.db` +CURRENT_STREAM="no stream" #will be set when calling `status` +if [ ! `id -u` -eq "0" ]; then + exec sudo "$0" "$@" +fi function start() { # start the given stream von $1 REQ=$1 tmux start-server - if status; then + if status &>/dev/null ; then echo "!! Stream already running!" exit 1 fi @@ -25,15 +29,39 @@ function start() { function stop() { #stops every stream - tmux kill-session -t streams || echo "!! killing session failed" + if status &>/dev/null; then + status | cut -d\ -f2 | xargs printf "** killing %s\n" + tmux kill-session -t streams 2>/dev/null || echo "!! killing session failed" + else + echo "** no stream running"; + return 1 + fi } function status() { - tmux has-session -t streams 2>/dev/null - RET=$? - tmux list-sessions 2>/dev/null - return $RET + #tmux has-session -t streams 2>/dev/null + #RET=$? + + #tmux list-sessions 2>/dev/null + #return $RET + EV="`ps -ef | grep tmux`" + if echo "$URLS" | while read URL NAME; do + if [ "`echo "$EV" | grep \"$URL\"`" ] ;then + echo "** $NAME running ($URL)" + exit 1 + fi + done; then + echo "** no stream running" + return 1 + else + return 0 + fi +} +function current() +{ + + return 1 } function list() { @@ -53,18 +81,13 @@ case "$1" in stop) stop ;; - restart) + (switch|restart) stop start $2 ;; status) - if status; then - echo "** stream running" - exit 0 - else - echo "** Stream not running" - exit 1 - fi + status + exit $? ;; list) list -- cgit v1.2.3 From c06d2bfb78682f4e72966274d7185c41d7309bbd Mon Sep 17 00:00:00 2001 From: root Date: Fri, 5 Aug 2011 22:31:54 +0200 Subject: streams: fixed status bug in streams startup --- streams/streams | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'streams') diff --git a/streams/streams b/streams/streams index c5e9e471..607fd9e5 100755 --- a/streams/streams +++ b/streams/streams @@ -50,7 +50,7 @@ function status() #tmux list-sessions 2>/dev/null #return $RET - EV="`ps -ef | grep tmux`" + EV="`ps -ef | grep mplayer`" if echo "$URLS" | while read URL NAME; do if [ "`echo "$EV" | grep \"$URL\"`" ] ;then echo "** $NAME running ($URL)" -- cgit v1.2.3 From b8a7f98b0082bbe4475b0c413ab7b90d9d7b5c7c Mon Sep 17 00:00:00 2001 From: root Date: Fri, 5 Aug 2011 22:31:54 +0200 Subject: streams: fixed status bug in streams startup --- streams/streams | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'streams') diff --git a/streams/streams b/streams/streams index c5e9e471..607fd9e5 100755 --- a/streams/streams +++ b/streams/streams @@ -50,7 +50,7 @@ function status() #tmux list-sessions 2>/dev/null #return $RET - EV="`ps -ef | grep tmux`" + EV="`ps -ef | grep mplayer`" if echo "$URLS" | while read URL NAME; do if [ "`echo "$EV" | grep \"$URL\"`" ] ;then echo "** $NAME running ($URL)" -- cgit v1.2.3 From c282ed39d512e92a26370497792362159b23dae5 Mon Sep 17 00:00:00 2001 From: makefu Date: Sun, 7 Aug 2011 17:32:24 +0200 Subject: stream/stream.db: added local icecast to list krebs now has icecast installed, added entry to stream.db --- streams/stream.db | 1 + 1 file changed, 1 insertion(+) (limited to 'streams') 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 -- cgit v1.2.3 From 81eb6b3220ad70daba291177857f3bc05c3ec48b Mon Sep 17 00:00:00 2001 From: root Date: Sun, 7 Aug 2011 17:33:21 +0200 Subject: streams/streams: add infinite loop to command --- streams/streams | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'streams') 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 -- cgit v1.2.3 From 729987c0b77b5b21f565446b62a614283c1e2b48 Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 12 Aug 2011 19:17:14 +0200 Subject: streams: add streams to new bin folder --- streams/Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'streams') diff --git a/streams/Makefile b/streams/Makefile index 0922e38f..209eb656 100644 --- a/streams/Makefile +++ b/streams/Makefile @@ -9,3 +9,4 @@ all: $(streams) $(streams): @test -L $(INITD)$@ || test ! -e $(INITD)$@ && \ ln -n -s -f $$PWD/stream-starter $(INITD)$@ && echo "writing $@ to $(INITD)" + ln -sf $$PWD/streams ../bin/streams -- cgit v1.2.3 From e75fd3fcb3bedc0b5a1783d2d7873a1c8cc33fbb Mon Sep 17 00:00:00 2001 From: root Date: Fri, 26 Aug 2011 15:37:25 +0200 Subject: Adding jungletrain --- streams/stream.db | 1 + 1 file changed, 1 insertion(+) (limited to 'streams') diff --git a/streams/stream.db b/streams/stream.db index e97a202e..34acaa71 100644 --- a/streams/stream.db +++ b/streams/stream.db @@ -4,3 +4,4 @@ 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 +http://stream2.jungletrain.net:8000 jungletrain -- cgit v1.2.3 From 85209ffad3546dd4654858c38c48b0572609cbda Mon Sep 17 00:00:00 2001 From: jvanvinkenroye Date: Mon, 29 Aug 2011 20:01:33 +0300 Subject: Added Tormented Radio http://www.tormentedradio.com/ --- streams/stream.db | 1 + 1 file changed, 1 insertion(+) (limited to 'streams') diff --git a/streams/stream.db b/streams/stream.db index 34acaa71..5efeb9ea 100644 --- a/streams/stream.db +++ b/streams/stream.db @@ -5,3 +5,4 @@ http://bassdrive.com/v2/streams/BassDrive.pls bassdrive http://somafm.com/illstreet.pls illstreet http://localhost:8000/stream.ogg icecast http://stream2.jungletrain.net:8000 jungletrain +http://playlist.tormentedradio.com/tormentedradio.pls tormented -- cgit v1.2.3 From eba52f4e39daac4b4b0f14cfe3cb42cbbac4aaf6 Mon Sep 17 00:00:00 2001 From: root Date: Sat, 3 Sep 2011 16:45:47 +0200 Subject: adding mpd stream to streams --- streams/stream.db | 1 + 1 file changed, 1 insertion(+) (limited to 'streams') diff --git a/streams/stream.db b/streams/stream.db index 5efeb9ea..2a71f369 100644 --- a/streams/stream.db +++ b/streams/stream.db @@ -6,3 +6,4 @@ http://somafm.com/illstreet.pls illstreet http://localhost:8000/stream.ogg icecast http://stream2.jungletrain.net:8000 jungletrain http://playlist.tormentedradio.com/tormentedradio.pls tormented +http:/filebitch.shack:8000 mpd -- cgit v1.2.3 From a8150875936a0229d330846590c3211048800c89 Mon Sep 17 00:00:00 2001 From: root Date: Sat, 3 Sep 2011 17:09:34 +0200 Subject: fixed mpd entry --- streams/stream.db | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'streams') diff --git a/streams/stream.db b/streams/stream.db index 2a71f369..47ccf7b5 100644 --- a/streams/stream.db +++ b/streams/stream.db @@ -6,4 +6,4 @@ http://somafm.com/illstreet.pls illstreet http://localhost:8000/stream.ogg icecast http://stream2.jungletrain.net:8000 jungletrain http://playlist.tormentedradio.com/tormentedradio.pls tormented -http:/filebitch.shack:8000 mpd +http://filebitch.shack:8000 mpd -- cgit v1.2.3