From f770eb572a03bc0d12add642999240b15c9466b4 Mon Sep 17 00:00:00 2001 From: yomguy Date: Thu, 1 Sep 2011 17:07:31 +0200 Subject: [PATCH] mv video on page, add a default deefuzzer video conf --- conf/etc/telecaster/deefuzzer_video.xml | 329 ++++++++++++++++++++++++ webview.py | 4 +- 2 files changed, 331 insertions(+), 2 deletions(-) create mode 100644 conf/etc/telecaster/deefuzzer_video.xml diff --git a/conf/etc/telecaster/deefuzzer_video.xml b/conf/etc/telecaster/deefuzzer_video.xml new file mode 100644 index 0000000..bd0db95 --- /dev/null +++ b/conf/etc/telecaster/deefuzzer_video.xml @@ -0,0 +1,329 @@ + + /var/log/deefuzzer/telecaster.log + /var/www/m3u/telecaster.m3u + + + + telecaster_local + TeleCaster Localhost + TeleCaster local audio streaming + http://parisson.com + Vocal + + + 127.0.0.1 + 8000 + source2parisson + 0 + + + /path/to/ogg + ogg + 64 + 4 + 44100 + 1 + 0 + + + /var/www/rss + 0 + + + 0 + 76728330-OjKgbHtn4II86Ad7pNUGEzfNAkGTW5Wvw38qUmLE + 4egZs1dSM37XVY8zXa016Yueku2fleXF2bx8k25V4 + bla bla + + + 0 + /path/to/jingles + 1 + + + 1 + 1234 + + + 1 + http://127.0.0.1:8000/telecaster_live.ogg + Parisson + + + 1 + /path/to/archives + + + + + + + telecaster + TeleCaster Remote + TeleCaster Remote + http://parisson.com + School + + + stream.parisson.com + 8000 + source2parisson + 0 + + + /path/to/ogg + ogg + 96 + 4 + 44100 + 1 + 0 + + + /var/www/rss + 0 + + + 0 + 76728330-OjKgbHtn4II86Ad7pNUGEzfNAkGTW5Wvw38qUmLE + 4egZs1dSM37XVY8zXa016Yueku2fleXF2bx8k25V4 + bla bla + + + 0 + /path/to/jingles + 1 + + + 0 + 1235 + + + 1 + http://127.0.0.1:8000/telecaster_live.ogg + Parisson + + + 0 + /path/to/archives + + + + + + + telecaster + TeleCaster Remote + TeleCaster Remote + http://parisson.com + School + + + stream.parisson.com + 8000 + source2parisson + 0 + + + /path/to/ogg + ogg + 96 + 4 + 44100 + 1 + 0 + + + /var/www/rss + 0 + + + 0 + 76728330-OjKgbHtn4II86Ad7pNUGEzfNAkGTW5Wvw38qUmLE + 4egZs1dSM37XVY8zXa016Yueku2fleXF2bx8k25V4 + bla bla + + + 0 + /path/to/jingles + 1 + + + 0 + 1235 + + + 1 + http://127.0.0.1:8000/telecaster_live.ogg + Parisson + + + 0 + /path/to/archives + + + + + + telecaster_video + TeleCaster Video Localhost + TeleCaster local video streaming + http://parisson.com + Vocal + + + 127.0.0.1 + 8000 + source2parisson + 0 + + + /path/to/ogg + ogg + 64 + 4 + 44100 + 1 + 0 + + + /var/www/rss + 0 + + + 0 + 76728330-OjKgbHtn4II86Ad7pNUGEzfNAkGTW5Wvw38qUmLE + 4egZs1dSM37XVY8zXa016Yueku2fleXF2bx8k25V4 + bla bla + + + 0 + /path/to/jingles + 1 + + + 1 + 1235 + + + 1 + http://127.0.0.1:8000/telecaster_live_video.ogg + Parisson + + + 1 + /path/to/archives + + + + + + + telecaster_video + TeleCaster Video Remote + TeleCaster Video Remote + http://parisson.com + School + + + stream.parisson.com + 8000 + source2parisson + 0 + + + /path/to/ogg + ogg + 96 + 4 + 44100 + 1 + 0 + + + /var/www/rss + 0 + + + 0 + 76728330-OjKgbHtn4II86Ad7pNUGEzfNAkGTW5Wvw38qUmLE + 4egZs1dSM37XVY8zXa016Yueku2fleXF2bx8k25V4 + bla bla + + + 0 + /path/to/jingles + 1 + + + 0 + 1235 + + + 1 + http://127.0.0.1:8000/telecaster_live_video.ogg + Parisson + + + 0 + /path/to/archives + + + + + + + telecaster + TeleCaster Remote + TeleCaster Remote + http://parisson.com + School + + + stream.parisson.com + 8000 + source2parisson + 0 + + + /path/to/ogg + ogg + 96 + 4 + 44100 + 1 + 0 + + + /var/www/rss + 0 + + + 0 + 76728330-OjKgbHtn4II86Ad7pNUGEzfNAkGTW5Wvw38qUmLE + 4egZs1dSM37XVY8zXa016Yueku2fleXF2bx8k25V4 + bla bla + + + 0 + /path/to/jingles + 1 + + + 0 + 1235 + + + 1 + http://127.0.0.1:8000/telecaster_live_video.ogg + Parisson + + + 0 + /path/to/archives + + + + + + diff --git a/webview.py b/webview.py index 47fbe8b..619c2fd 100644 --- a/webview.py +++ b/webview.py @@ -192,6 +192,7 @@ class WebView(FieldStorage): print "
" print "
Status
" + self.video() print "" print "" print "" % self.conf['infos']['url'] @@ -228,7 +229,6 @@ class WebView(FieldStorage): print "" print "" print "
Name : %s
" - self.video() print "
" @@ -282,7 +282,7 @@ class WebView(FieldStorage): self.footer() def video(self): - print "
" + print "
" print "" print "
" -- 2.39.5