brmlab/brmdoor
4
0
Fork 0
mirror of https://github.com/brmlab/brmdoor.git synced 2025-06-08 11:44:01 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into brmd-componentize

Browse source 
Conflicts:
	brmd/brmd.pl
This commit is contained in:
Petr Baudis 2011-05-10 22:26:00 +02:00
commit 360156d0de
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
brmd/brmd.pl
View file

@ -287,7 +287,7 @@ sub web_index {
<li><strong>brmstatus</strong> ($sts) <a href="brmstatus.html">status page</a> | <a href="brmstatus.js">javascript code</a> | <a href="brmstatus.txt">plaintext file</a> | <a href="brmstatus.png">picture</a></li> <li><strong>brmstatus</strong> ($sts) <a href="brmstatus.html">status page</a> | <a href="brmstatus.js">javascript code</a> | <a href="brmstatus.txt">plaintext file</a> | <a href="brmstatus.png">picture</a></li>
<li><strong>brmvideo</strong> ($str) $r_link</li> <li><strong>brmvideo</strong> ($str) $r_link</li>
</ul> </ul>
<p align="right"><a href="http://gitorious.org/brmlab/brmdoor">(view source)</a></p> <p align="right"><a href="http://github.com/brmlab/brmdoor">(view source)</a></p>
</body></html> </body></html>
EOT EOT
); );
@ -577,6 +577,7 @@ sub _default {
sub stream_switch { sub stream_switch {
my ($s) = @_; my ($s) = @_;
system('ssh brmstream@brmvid "echo '.($s?'START':'STOP').' >/tmp/brmstream"'); system('ssh brmstream@brmvid "echo '.($s?'START':'STOP').' >/tmp/brmstream"');
system('~/alphasign/'.($s?'on':'off').'_air.py');
} }
sub stream_start { sub stream_start {