Author: dmeyer
Date: Sat Mar 8 14:32:11 2008
New Revision: 10485
Log:
missing adjustments to kaa.* changes
Modified:
trunk/tvserver/bin/freevo-tvserver
trunk/tvserver/src/recorder.py
trunk/tvserver/src/server.py
Modified: trunk/tvserver/bin/freevo-tvserver
==============================================================================
--- trunk/tvserver/bin/freevo-tvserver (original)
+++ trunk/tvserver/bin/freevo-tvserver Sat Mar 8 14:32:11 2008
@@ -155,6 +155,7 @@
# get logging object
log = logging.getLogger('record')
[EMAIL PROTECTED]()
def start():
"""
Start tvserver.
@@ -177,11 +178,7 @@
auth = mbus.cfg.hashkey.strip()
host = mbus.addr['id'][mbus.addr['id'].find('@')+1:]
- port = epg.server.rpc('server.start', host + ':0', auth)
- while not port.is_finished():
- # FIXME: add this during runtime!
- kaa.main.step()
- port = port()[1]
+ port = (yield epg.server.rpc('server.start', host + ':0', auth))[1]
# make epg information public
server.epgaddr = (host, port)
Modified: trunk/tvserver/src/recorder.py
==============================================================================
--- trunk/tvserver/src/recorder.py (original)
+++ trunk/tvserver/src/recorder.py Sat Mar 8 14:32:11 2008
@@ -268,17 +268,17 @@
# step 1, see config for override
if channel in config.epg.mapping:
- chan =
kaa.epg.guide.get_channel(config.epg.mapping[channel])
+ chan = yield
kaa.epg.guide.get_channel(config.epg.mapping[channel])
if chan:
self.add_channel(chan, channel)
continue
# step 2, try tuner_id
- chan = kaa.epg.guide.get_channel_by_tuner_id(channel)
+ chan = yield kaa.epg.guide.get_channel_by_tuner_id(channel)
if not chan:
# step 3, try name
- chan = kaa.epg.guide.get_channel(channel)
+ chan = yield kaa.epg.guide.get_channel(channel)
if chan:
self.add_channel(chan, channel)
@@ -288,7 +288,7 @@
# Stop here. The channel is in the mapping list but not
# detected by the system. Before we do some bad guessing,
# just set the channel to a non epg channel
- chan = kaa.epg.guide.new_channel(name=channel)
+ chan = yield kaa.epg.guide.new_channel(name=channel)
self.add_channel(chan, channel)
continue
@@ -297,7 +297,7 @@
found = False
# maybe the name is a little bit different
normchannel = self.normalize_name(channel)
- for c in kaa.epg.guide.get_channels():
+ for c in (yield kaa.epg.guide.get_channels()):
if self.normalize_name(c.name) == normchannel:
self.add_channel(c, channel)
config.epg.mapping[channel] = c.name
Modified: trunk/tvserver/src/server.py
==============================================================================
--- trunk/tvserver/src/server.py (original)
+++ trunk/tvserver/src/server.py Sat Mar 8 14:32:11 2008
@@ -114,7 +114,7 @@
self.update_status()
- @kaa.timed(0.1, kaa.OneShotTimer, type=kaa.POLICY_ONCE)
+ @kaa.timed(0.1, kaa.OneShotTimer, policy=kaa.POLICY_ONCE)
def print_schedule(self):
"""
Print current schedule (for debug only)
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
