fix play live urls, condition for forcing deefuzzer kill

diff --git a/telecaster.py b/telecaster.py
index d08f103cd1cb12d2f7d6657718fb3f332be0e2dc..6c4b729804d3b08dc07090df68f4fc335559b347 100755 (executable)
--- a/telecaster.py
+++ b/telecaster.py
@@ -125,9 +125,9 @@ class TeleCaster:
             form.start_form(writing, casting)
             self.logger.write_info('stopped')
 
-       else:
+       elif deefuzzer_pid != []:
            os.system('kill -9 '+deefuzzer_pid[0])
-           #self.main()
+           self.main()
       
 
 conf_file = '/etc/telecaster/telecaster.xml'

diff --git a/webview.py b/webview.py
index 3a4bf3103acd2677018680db04172a8d024b48d2..ab69cb4833038e0513c954b533071376fc45be12 100644 (file)
--- a/webview.py
+++ b/webview.py
@@ -231,7 +231,7 @@ class WebView(FieldStorage):
         self.casting = writing
         self.writing = casting
         self.refresh = False
-
+       self.mount_point = 'telecaster_live.' + self.format + '.m3u'
         self.header()
         self.javascript()
         self.sub_header()
@@ -267,6 +267,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=\"/archives/\"><img src=\"img/folder_go.png\" alt=\"\">Archives</a>"
         print "<a href=\"/trash/\"><img src=\"img/bin.png\" alt=\"\">Trash</a>"
         print "</div>"
@@ -304,7 +305,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=\""+self.url+":"+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+"\"><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>"