add m3u to audio links, set 15s sleep after jack-rack starting

diff --git a/conf/home/fluxbox/autostart.sh b/conf/home/fluxbox/autostart.sh
index e67f0984d050c2b17089aedd83458e33e884b9c0..b5ceb8a6906a73fd11d85eacaf7c29341096ff13 100755 (executable)
--- a/conf/home/fluxbox/autostart.sh
+++ b/conf/home/fluxbox/autostart.sh
@@ -6,7 +6,7 @@ if [ ! $pid = "" ]; then
  sleep 1
 else
  jack-rack -n /etc/telecaster/eq_comp_limit_02.rack > /dev/null &
- sleep 10
+ sleep 15
  jack_connect system:capture_1 jack_rack:in_1
  jack_connect system:capture_2 jack_rack:in_2
 fi

diff --git a/conf/home/fluxbox/startup.ubuntu b/conf/home/fluxbox/startup.ubuntu
index ee3e8fe29042b7a0903ee1a99ae946d21b929a81..ad52164f03ea776d0e0063bcc0bae31e4877df00 100644 (file)
--- a/conf/home/fluxbox/startup.ubuntu
+++ b/conf/home/fluxbox/startup.ubuntu
@@ -33,7 +33,7 @@ if [ ! $pid = "" ]; then
  sleep 1
 else
  jack-rack -n /etc/telecaster/eq_comp_limit_02.rack > /dev/null &
- sleep 10
+ sleep 15
  jack_connect system:capture_1 jack_rack:in_1
  jack_connect system:capture_2 jack_rack:in_2
 fi

diff --git a/webview.py b/webview.py
index 72bf24d5d3957b2f42f5e62a6ba1f0b042fe3c43..34679319a37231406bd6afae957357c14ddbece1 100644 (file)
--- a/webview.py
+++ b/webview.py
@@ -266,7 +266,7 @@ class WebView(FieldStorage):
         print "<div class=\"buttons\">"
         print "<button type=\"submit\" class=\"positive\"><img src=\"img/arrow_refresh.png\" alt=\"\">Refresh</button>"
         print "<button type=\"submit\" name=\"action\" value=\"start\" class=\"negative\"><img src=\"img/stop.png\" alt=\"\">Record</button>"
-        print "<a href=\"http://"+self.ip+":"+self.port+"/"+self.mount_point+"\"><img src=\"img/control_play_blue.png\" alt=\"\">Play Live</a>"
+        print "<a href=\"http://"+self.ip+":"+self.port+"/"+self.mount_point+".m3u\"><img src=\"img/control_play_blue.png\" alt=\"\">Play Live</a>"
         print "<a href=\"http://"+self.ip+"/archives/\"><img src=\"img/folder_go.png\" alt=\"\">Archives</a>"
         print "<a href=\"http://"+self.ip+"/trash/\"><img src=\"img/bin.png\" alt=\"\">Trash</a>"
         print "</div>"
@@ -309,7 +309,7 @@ class WebView(FieldStorage):
         print "<div class=\"tools\">"
         print "<div class=\"buttons\">"
         print "<button type=\"submit\"><img src=\"img/arrow_refresh.png\" alt=\"\">Refresh</button>"
-        print "<a href=\"http://"+self.ip+":"+self.port+"/"+self.mount_point+"\"><img src=\"img/control_play_blue.png\" alt=\"\">Play</a>"
+        print "<a href=\"http://"+self.ip+":"+self.port+"/"+self.mount_point+".m3u\"><img src=\"img/control_play_blue.png\" alt=\"\">Play</a>"
         print "<button type=\"submit\" name=\"action\" value=\"stop\" class=\"negative\"><img src=\"img/cancel.png\" alt=\"\">Stop</button>"
         print "<a href=\"/archives/\"><img src=\"img/folder_go.png\" alt=\"\">Archives</a>"
         print "<a href=\"/trash/\"><img src=\"img/bin.png\" alt=\"\">Trash</a>"