Author: dmeyer
Date: Sun Feb 19 14:37:24 2006
New Revision: 7921
Modified:
trunk/tvserver/src/conflict.py
trunk/tvserver/src/recording.py
trunk/tvserver/src/server.py
Log:
bugfix
Modified: trunk/tvserver/src/conflict.py
==============================================================================
--- trunk/tvserver/src/conflict.py (original)
+++ trunk/tvserver/src/conflict.py Sun Feb 19 14:37:24 2006
@@ -289,7 +289,7 @@
# FIXME: maybe start != stop
schedule[r.id][2] = False
for c in r.conflict_padding:
- schedule[r.id][3] = False
+ schedule[c.id][3] = False
for r in devices[-1].rec:
schedule[r.id] = [ CONFLICT, None, True, True ]
Modified: trunk/tvserver/src/recording.py
==============================================================================
--- trunk/tvserver/src/recording.py (original)
+++ trunk/tvserver/src/recording.py Sun Feb 19 14:37:24 2006
@@ -72,7 +72,7 @@
def __init__(self, name = 'unknown', channel = 'unknown',
priority = 0, start = 0, stop = 0, node=None,
- **info ):
+ info={} ):
self.id = Recording.NEXT_ID
Recording.NEXT_ID += 1
Modified: trunk/tvserver/src/server.py
==============================================================================
--- trunk/tvserver/src/server.py (original)
+++ trunk/tvserver/src/server.py Sun Feb 19 14:37:24 2006
@@ -359,7 +359,7 @@
info = dict(info)
log.info('recording.add: %s' % String(name))
- r = Recording(name, channel, priority, start, stop, **info)
+ r = Recording(name, channel, priority, start, stop, info=info)
if r in self.recordings:
r = self.recordings[self.recordings.index(r)]
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
