From 81553cd4e2d0ceb8e9a99cf970b4126f63561e07 Mon Sep 17 00:00:00 2001 From: Jan Krcmar Date: Wed, 12 Jan 2011 15:36:30 +0100 Subject: [PATCH] moved from screen to tmux --- tv_controller.py | 6 +++--- tv_web.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tv_controller.py b/tv_controller.py index 99c3f86..3432982 100644 --- a/tv_controller.py +++ b/tv_controller.py @@ -7,7 +7,7 @@ import alsaaudio class VideoController: def __init__(self): - self.vars = "XAUTHORITY=/home/honza801/.Xauthority DISPLAY=:0.0" + pass def is_running(self): process = os.popen('pgrep vlc').readline() @@ -37,7 +37,7 @@ class VideoController: print "Another mplayer is running with pid", pid return else: - q = self.vars+" screen -X screen /home/honza801/bin/tv "+channel + q = "tmux neww '/home/honza801/bin/tv "+channel+"'" ret = os.system(q) print q, ret @@ -49,7 +49,7 @@ class VideoController: print "Another mplayer is running with pid", pid return else: - q = self.vars+" screen -X screen /home/honza801/bin/tv \""+file+"\"" + q = "tmux neww '/home/honza801/bin/tv \""+file+"\"'" ret = os.system(q) print q, ret diff --git a/tv_web.py b/tv_web.py index db7576c..7021e2e 100755 --- a/tv_web.py +++ b/tv_web.py @@ -134,7 +134,7 @@ class TvWeb: # checks allowed hosts def hostallowed(self): - allowed = [ '128.10.20.1', '128.10.20.5' , '10.10.60.14', '127.0.0.1', ] + allowed = [ '128.10.20.1', '128.10.20.5' , '10.10.60.14', '127.0.0.1', '192.168.100.104', ] hostip = cherrypy.request.remote.ip if hostip in allowed: return True -- 2.11.4.GIT