Author: duncan
Date: Sun Feb 17 17:25:33 2008
New Revision: 10375
Log:
Changed to use kaa.rpc from Twisted
Modified:
branches/rel-1/freevo/src/helpers/recordserver.py
branches/rel-1/freevo/src/helpers/schedulefavorites.py
branches/rel-1/freevo/src/helpers/tv_grab.py
branches/rel-1/freevo/src/plugins/autoshutdown.py
branches/rel-1/freevo/src/tv/edit_favorite.py
branches/rel-1/freevo/src/tv/epg_types.py
branches/rel-1/freevo/src/tv/favoriteitem.py
branches/rel-1/freevo/src/tv/plugins/manual_record.py
branches/rel-1/freevo/src/tv/plugins/scheduled_recordings.py
branches/rel-1/freevo/src/tv/plugins/search_programs.py
branches/rel-1/freevo/src/tv/plugins/view_favorites.py
branches/rel-1/freevo/src/tv/programitem.py
branches/rel-1/freevo/src/tv/record_client.py
branches/rel-1/freevo/src/tv/tvguide.py
Modified: branches/rel-1/freevo/src/helpers/recordserver.py
==============================================================================
--- branches/rel-1/freevo/src/helpers/recordserver.py (original)
+++ branches/rel-1/freevo/src/helpers/recordserver.py Sun Feb 17 17:25:33 2008
@@ -768,7 +768,7 @@
if schedule == {}:
return (FALSE, 'prog not scheduled')
- if not schedule:
+ if schedule is None:
schedule = self.getScheduledRecordings().getProgramList()
for me in schedule.values():
Modified: branches/rel-1/freevo/src/helpers/schedulefavorites.py
==============================================================================
--- branches/rel-1/freevo/src/helpers/schedulefavorites.py (original)
+++ branches/rel-1/freevo/src/helpers/schedulefavorites.py Sun Feb 17
17:25:33 2008
@@ -40,8 +40,8 @@
print '%s' % (result[1])
raise SystemExit
-recordclient = RecordClient()
-if not recordclient.updateFavoritesSchedule(handler):
+print _('Updating recording schedule')
+if not RecordClient().updateFavoritesSchedule(handler):
print _('recordserver is not running')
raise SystemExit
Modified: branches/rel-1/freevo/src/helpers/tv_grab.py
==============================================================================
--- branches/rel-1/freevo/src/helpers/tv_grab.py (original)
+++ branches/rel-1/freevo/src/helpers/tv_grab.py Sun Feb 17 17:25:33 2008
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# -*- coding: iso-8859-1 -*-
# -----------------------------------------------------------------------
-# tv_grab.py - wrapper for xmltv
+# wrapper for xmltv
# -----------------------------------------------------------------------
# $Id$
#
@@ -88,6 +88,10 @@
if __name__ == '__main__':
+ def handler(result):
+ print '%s' % (result[1])
+ raise SystemExit
+
if len(sys.argv)>1 and sys.argv[1] == '--help':
usage()
@@ -110,9 +114,12 @@
grab()
- import tv.record_client as rc
+ import kaa
+ from tv.record_client import RecordClient
print 'Scheduling favorites for recording: '
+ if not RecordClient().updateFavoritesSchedule(handler):
+ print _('recordserver is not running')
+ raise SystemExit
- (result, response) = rc.updateFavoritesSchedule()
- print ' %s' % response
+ kaa.main.run()
Modified: branches/rel-1/freevo/src/plugins/autoshutdown.py
==============================================================================
--- branches/rel-1/freevo/src/plugins/autoshutdown.py (original)
+++ branches/rel-1/freevo/src/plugins/autoshutdown.py Sun Feb 17 17:25:33 2008
@@ -1,6 +1,6 @@
# -*- coding: iso-8859-1 -*-
# -----------------------------------------------------------------------
-# autoshutdown.py - Automated Shutdown
+# Automated Shutdown
# -----------------------------------------------------------------------
# $Id$
#
@@ -44,6 +44,8 @@
from gui.AlertBox import AlertBox
from tv.record_client import RecordClient
+recordclient = RecordClient()
+
# Exception handling classes
class ExInternalError : pass
@@ -64,8 +66,6 @@
class ExRecordingInProgress(Exception) : pass
-record_client = RecordClient()
-
class PluginInterface(plugin.MainMenuPlugin):
"""
@@ -696,8 +696,8 @@
global updatedFavoritesSchedule
if not updatedFavoritesSchedule:
updatedFavoritesSchedule = True
- record_client.updateFavoritesScheduleNow()
- schedule = record_client.getScheduledRecordingsNow()
+ recordclient.updateFavoritesScheduleNow()
+ schedule = recordclient.getScheduledRecordingsNow()
except Exception, why:
raise ExNoRecordServer
else:
Modified: branches/rel-1/freevo/src/tv/edit_favorite.py
==============================================================================
--- branches/rel-1/freevo/src/tv/edit_favorite.py (original)
+++ branches/rel-1/freevo/src/tv/edit_favorite.py Sun Feb 17 17:25:33 2008
@@ -32,8 +32,9 @@
from time import gmtime, strftime
-import config, epg_xmltv
-import record_client
+import config
+import tv.epg_xmltv
+from tv.record_client import RecordClient
import event as em
from record_types import Favorite
@@ -72,16 +73,16 @@
else:
context = 'guide'
+ self.recordclient = RecordClient()
if isinstance(subject, TvProgram):
- (result, favs) = record_client.getFavorites()
+ (result, favs) = self.recordclient.getFavorites()
if result:
num_favorites = len(favs)
self.priority = num_favorites + 1
else:
self.priority = 1
- self.fav = Favorite(subject.title, subject, TRUE, TRUE, TRUE,
- self.priority, TRUE, FALSE)
+ self.fav = Favorite(subject.title, subject, TRUE, TRUE, TRUE,
self.priority, TRUE, FALSE)
else:
self.fav = subject
@@ -193,7 +194,7 @@
def removeFavorite(self):
_debug_('removeFavorite()', 2)
- (result, msg) = record_client.removeFavorite(self.oldname)
+ (result, msg) = self.recordclient.removeFavoriteNow(self.oldname)
if result:
searcher = None
if self.parent and self.context == 'favorites':
@@ -310,8 +311,8 @@
elif self.get_selected_child() == self.save:
if event == em.INPUT_ENTER:
if self.oldname:
- record_client.removeFavorite(self.oldname)
- (result, msg) = record_client.addEditedFavorite(
+ self.recordclient.removeFavoriteNow(self.oldname)
+ (result, msg) = self.recordclient.addEditedFavoriteNow(
self.name_input.get_word(),
self.fav.title,
self.chan_box.list.get_selected_item().value,
Modified: branches/rel-1/freevo/src/tv/epg_types.py
==============================================================================
--- branches/rel-1/freevo/src/tv/epg_types.py (original)
+++ branches/rel-1/freevo/src/tv/epg_types.py Sun Feb 17 17:25:33 2008
@@ -70,14 +70,14 @@
onlyNew = None
- def __init__(self):
- self.channel_id = ''
- self.title = ''
+ def __init__(self, title='', channel_id='', start=0, stop=0):
+ self.channel_id = channel_id
+ self.title = title
self.desc = ''
self.sub_title = ''
- self.start = 0.0
+ self.start = start
self.pdc_start = 0.0
- self.stop = 0.0
+ self.stop = stop
self.ratings = {}
self.advisories = []
self.categories = []
@@ -109,16 +109,31 @@
return s
+ def __eq__(self, other):
+ """ equality method """
+ #print 'DJW: __eq__(self=%r, other=%r)' % (self, other)
+ if not isinstance(other, TvProgram):
+ return False
+ return self.start == other.start \
+ and self.stop == other.stop \
+ and self.title == other.title \
+ and self.channel_id == other.channel_id
+
+
def __cmp__(self, other):
- """
- compare function, return 0 if the objects are identical, 1 otherwise
- """
- if not other:
+ """ compare function, return 0 if the objects are equal, <0 if less >0
if greater """
+ #print 'DJW: __cmp__(self=%r, other=%r)' % (self, other)
+ if not isinstance(other, TvProgram):
return 1
- return self.title != other.title or \
- self.start != other.start or \
- self.stop != other.stop or \
- self.channel_id != other.channel_id
+ if self.start != other.start:
+ return self.start - other.start
+ if self.stop != other.stop:
+ return self.stop - other.stop
+ if self.title != other.title:
+ return self.title > other.title
+ if self.channel_id != other.channel_id:
+ return self.channel_id > other.channel_id
+ return 0
def getattr(self, attr):
Modified: branches/rel-1/freevo/src/tv/favoriteitem.py
==============================================================================
--- branches/rel-1/freevo/src/tv/favoriteitem.py (original)
+++ branches/rel-1/freevo/src/tv/favoriteitem.py Sun Feb 17 17:25:33 2008
@@ -38,7 +38,7 @@
from gui.AlertBox import AlertBox
from gui.PopupBox import PopupBox
-import tv.record_client as record_client
+from tv.record_client import RecordClient
class FavoriteItem(Item):
"""
@@ -48,6 +48,7 @@
""" """
Item.__init__(self, parent, skin_type='video')
_debug_('FavoriteItem.__init__(parent=%r, fav=%r, fav_action=%r)' %
(parent, fav, fav_action), 2)
+ self.recordclient = RecordClient()
self.fav = fav
self.name = self.origname = fav.name
self.title = fav.title
@@ -63,8 +64,7 @@
else:
self.onlyNew = fav.onlyNew = FALSE
- self.week_days = (_('Mon'), _('Tue'), _('Wed'), _('Thu'),
- _('Fri'), _('Sat'), _('Sun'))
+ self.week_days = (_('Mon'), _('Tue'), _('Wed'), _('Thu'), _('Fri'),
_('Sat'), _('Sun'))
if fav.channel == 'ANY':
self.channel = _('ANY CHANNEL')
@@ -78,8 +78,7 @@
self.mod = _('ANY TIME')
else:
try:
- self.mod = time.strftime(config.TV_TIME_FORMAT,
- time.gmtime(float(int(fav.mod) * 60)))
+ self.mod = time.strftime(config.TV_TIME_FORMAT,
time.gmtime(float(int(fav.mod) * 60)))
except:
print 'Cannot add "%s" to favorites' % fav.name
@@ -128,7 +127,7 @@
# XXX: priorities aren't quite supported yet
if 0:
- (got_favs, favs) = record_client.getFavorites()
+ (got_favs, favs) = self.recordclient.getFavoritesNow()
if got_favs and len(favs) > 1:
items.append(menu.MenuItem(_('Modify priority'),
action=self.mod_priority))
@@ -328,13 +327,13 @@
if self.fav_action == 'edit':
# first we remove the old favorite
- (result, msg) = record_client.removeFavorite(self.origname)
+ (result, msg) = self.recordclient.removeFavoriteNow(self.origname)
elif self.fav_action =='add':
result = True
if result:
# create a new edited favorite
- (result, msg) = record_client.addEditedFavorite(self.fav.name,
+ (result, msg) =
self.recordclient.addEditedFavoriteNow(self.fav.name,
self.fav.title, self.fav.channel, self.fav.dow, self.fav.mod,
self.fav.priority, self.fav.allowDuplicates, self.fav.onlyNew)
if result:
@@ -359,7 +358,7 @@
"""
_debug_('rem_favorite(arg=%r, menuw=%r)' % (arg, menuw), 2)
name = self.origname
- (result, msg) = record_client.removeFavorite(name)
+ (result, msg) = self.recordclient.removeFavoriteNow(name)
if result:
# if this is successfull
if menuw:
Modified: branches/rel-1/freevo/src/tv/plugins/manual_record.py
==============================================================================
--- branches/rel-1/freevo/src/tv/plugins/manual_record.py (original)
+++ branches/rel-1/freevo/src/tv/plugins/manual_record.py Sun Feb 17
17:25:33 2008
@@ -1,6 +1,6 @@
# -*- coding: iso-8859-1 -*-
# -----------------------------------------------------------------------
-# manual_record.py - A plugin to manually record programs
+# A plugin to manually record programs
# -----------------------------------------------------------------------
# $Id$
#
@@ -36,7 +36,7 @@
import plugin, config, menu
import util.tv_util as tv_util
-import tv.record_client as record_client
+from tv.record_client import RecordClient
import event as em
from item import Item
@@ -55,12 +55,15 @@
class ManualRecordItem(Item):
+
def __init__(self, parent):
_debug_('manual_record.ManualRecordItem.__init__(parent)', 2)
Item.__init__(self, parent, skin_type='video')
self.name = _("Manual Record")
+ self.recordclient = RecordClient()
+
# maxinum number of days we can record
self.MAXDAYS = 7
@@ -79,6 +82,7 @@
self.stopnow = now
self.stoptime = time.localtime(now)
+
def make_newprog(self):
_debug_('make_newprog(self)', 2)
self.prog = TvProgram()
@@ -107,6 +111,7 @@
self.prog.stop = self.stopnow
self.disp_stoptime = '%s %s %s' % (self.disp_stop_month,
self.stop_day, self.stop_time)
+
def actions(self):
_debug_('actions(self)', 2)
return [( self.display_recitem , _('Display record item') )]
@@ -331,7 +336,7 @@
_debug_('save_changes(self, arg=None, menuw=None)', 2)
result = self.check_prog()
if result:
- (result, msg) = record_client.scheduleRecording(self.prog)
+ (result, msg) = self.recordclient.scheduleRecordingNow(self.prog)
if not result:
AlertBox(text=_('Save Failed, recording was lost')+(': %s' %
msg)).show()
@@ -391,11 +396,11 @@
| plugin.activate('tv.view_favorites')
"""
-
def __init__(self):
_debug_('manual_record.PluginInterface.__init__()', 2)
plugin.MainMenuPlugin.__init__(self)
+
def items(self, parent):
_debug_('items(self, parent)', 2)
if config.TV_CHANNELS:
Modified: branches/rel-1/freevo/src/tv/plugins/scheduled_recordings.py
==============================================================================
--- branches/rel-1/freevo/src/tv/plugins/scheduled_recordings.py
(original)
+++ branches/rel-1/freevo/src/tv/plugins/scheduled_recordings.py Sun Feb
17 17:25:33 2008
@@ -32,7 +32,7 @@
import os
import config, plugin, menu, rc
-import tv.record_client as record_client
+from tv.record_client import RecordClient
from gui.AlertBox import AlertBox
from item import Item
@@ -44,6 +44,7 @@
Item.__init__(self, parent, skin_type='tv')
self.name = _('Scheduled Recordings')
self.menuw = None
+ self.recordclient = RecordClient()
def actions(self):
@@ -86,13 +87,13 @@
def get_items(self):
items = []
- (server_available, msg) = record_client.connectionTest()
- if not server_available:
- AlertBox(_('Recording server is unavailable.')+(': %s' %
msg)).show()
- return []
+ #(server_available, msg) = self.recordclient.connectionTest()
+ #if not server_available:
+ # AlertBox(_('Recording server is unavailable.')+(': %s' %
msg)).show()
+ # return []
- (result, recordings) = record_client.getScheduledRecordings()
- if result:
+ recordings = self.recordclient.getScheduledRecordingsNow()
+ if recordings is not None:
progs = recordings.getProgramList()
f = lambda a, b: cmp(a.start, b.start)
Modified: branches/rel-1/freevo/src/tv/plugins/search_programs.py
==============================================================================
--- branches/rel-1/freevo/src/tv/plugins/search_programs.py (original)
+++ branches/rel-1/freevo/src/tv/plugins/search_programs.py Sun Feb 17
17:25:33 2008
@@ -1,6 +1,6 @@
# -*- coding: iso-8859-1 -*-
# -----------------------------------------------------------------------
-# search_programs.py: searchs for programs
+# Search for programs
# -----------------------------------------------------------------------
# $Id$
#
@@ -51,7 +51,7 @@
from menu import MenuItem, Menu
from tv.programitem import ProgramItem
-import tv.record_client as record_client
+#from tv.record_client import RecordClient
from skin.widgets import TextEntryScreen
@@ -66,6 +66,7 @@
self._type = 'mainmenu_tv'
self.parent = None
+
def items(self, parent):
self.parent = parent
return [SearchPrograms(parent)]
@@ -77,13 +78,16 @@
Item.__init__(self, parent, skin_type='tv')
self.name = _('Search Programs')
+
def actions(self):
return [(self.show_search, self.name)]
+
def show_search(self, arg=None, menuw=None):
text_entry = TextEntryScreen((_('Search'), self.search_for_programs),
self.name)
text_entry.show(menuw)
+
def search_for_programs(self, menuw, text):
pop = PopupBox(text=_('Searching, please wait...'))
pop.show()
@@ -111,6 +115,7 @@
menuw.pushmenu(search_menu)
menuw.refresh()
+
def findMatches(self, find=None, movies_only=None):
global guide
@@ -155,6 +160,7 @@
return (TRUE, matches)
return (FALSE, 'no matches')
+
def updateGuide(self):
global guide
guide = tv.epg_xmltv.get_guide()
Modified: branches/rel-1/freevo/src/tv/plugins/view_favorites.py
==============================================================================
--- branches/rel-1/freevo/src/tv/plugins/view_favorites.py (original)
+++ branches/rel-1/freevo/src/tv/plugins/view_favorites.py Sun Feb 17
17:25:33 2008
@@ -31,7 +31,7 @@
import os
import config, plugin, menu, rc
-import tv.record_client as record_client
+from tv.record_client import RecordClient
from item import Item
from tv.favoriteitem import FavoriteItem
@@ -44,6 +44,7 @@
Item.__init__(self, parent, skin_type='tv')
self.name = _('View Favorites')
self.menuw = None
+ self.recordclient = RecordClient()
def actions(self):
@@ -88,12 +89,12 @@
_debug_('get_items()', 2)
items = []
- (server_available, msg) = record_client.connectionTest()
- if not server_available:
- AlertBox(_('Recording server is unavailable.')+(': %s' %
msg)).show()
- return []
+ #(server_available, msg) = self.recordclient.connectionTest()
+ #if not server_available:
+ # AlertBox(_('Recording server is unavailable.')+(': %s' %
msg)).show()
+ # return []
- (result, favorites) = record_client.getFavorites()
+ (result, favorites) = self.recordclient.getFavoritesNow()
if result:
f = lambda a, b: cmp(a.priority, b.priority)
favorites = favorites.values()
Modified: branches/rel-1/freevo/src/tv/programitem.py
==============================================================================
--- branches/rel-1/freevo/src/tv/programitem.py (original)
+++ branches/rel-1/freevo/src/tv/programitem.py Sun Feb 17 17:25:33 2008
@@ -278,7 +278,7 @@
if menuw:
menuw.delete_submenu(refresh=False)
- # get the favorite from the record_client
+ # get the favorite from the record client
(got_fav, fav) = self.recordclient.getFavoriteObjectNow(self.prog)
if got_fav:
# create a favorite item for the submenu
Modified: branches/rel-1/freevo/src/tv/record_client.py
==============================================================================
--- branches/rel-1/freevo/src/tv/record_client.py (original)
+++ branches/rel-1/freevo/src/tv/record_client.py Sun Feb 17 17:25:33 2008
@@ -1,6 +1,6 @@
# -*- coding: iso-8859-1 -*-
# -----------------------------------------------------------------------
-# record_client.py - A client interface to the Freevo recording server.
+# A client interface to the Freevo recording server.
# -----------------------------------------------------------------------
# $Id$
#
@@ -190,7 +190,7 @@
return None
inprogress.wait()
result = inprogress.get_result()
- _debug_('getScheduledRecordingsNow.result=%r' % (result,), 2)
+ _debug_('updateFavoritesScheduleNow.result=%r' % (result,), 2)
return result
@@ -230,6 +230,56 @@
return result
+ def clearFavoritesNow(self):
+ """ See if a programme is a favourite """
+ _debug_('clearFavoritesNow()', 1)
+ inprogress = self.recordserver_rpc('clearFavorites')
+ if inprogress is None:
+ return None
+ inprogress.wait()
+ result = inprogress.get_result()
+ _debug_('clearFavoritesNow.result=%r' % (result,), 1)
+ return result
+
+
+ def getFavoritesNow(self):
+ """ See if a programme is a favourite """
+ _debug_('getFavoritesNow()', 1)
+ inprogress = self.recordserver_rpc('getFavorites')
+ if inprogress is None:
+ return None
+ inprogress.wait()
+ result = inprogress.get_result()
+ _debug_('getFavoritesNow.result=%r' % (result,), 1)
+ return result
+
+
+ def removeFavoriteNow(self, name):
+ """ See if a programme is a favourite """
+ _debug_('removeFavoriteNow(name=%r)' % (name), 1)
+ inprogress = self.recordserver_rpc('removeFavorite', name)
+ if inprogress is None:
+ return None
+ inprogress.wait()
+ result = inprogress.get_result()
+ _debug_('removeFavoriteNow.result=%r' % (result,), 1)
+ return result
+
+
+ def addEditedFavoriteNow(self, name, title, chan, dow, mod, priority,
allowDuplicates, onlyNew):
+ """ See if a programme is a favourite """
+ _debug_('addEditedFavoriteNow(name=%r, title=%r, chan=%r, dow=%r,
mod=%r, priority=%r, allowDuplicates=%r, onlyNew=%r)' % \
+ (name, title, chan, dow, mod, priority, allowDuplicates, onlyNew),
1)
+ inprogress = self.recordserver_rpc('addEditedFavorite', \
+ name, title, chan, dow, mod, priority, allowDuplicates, onlyNew)
+ if inprogress is None:
+ return None
+ inprogress.wait()
+ result = inprogress.get_result()
+ _debug_('addEditedFavoriteNow.result=%r' % (result,), 1)
+ return result
+
+
def getFavoriteObjectNow(self, prog):
""" See if a programme is a favourite """
_debug_('getFavoriteObjectNow(prog=%r)' % (prog), 1)
@@ -606,8 +656,7 @@
def handler(result):
""" A callback handler for test functions """
_debug_('handler(result=%r)' % (result,), 2)
- print 'handler.result=%r' % (result,)
- print 'handler.result=%s' % (result,)
+ print 'handler.result=%r\n"%s"' % (result, result)
raise SystemExit
rc = RecordClient()
@@ -627,20 +676,20 @@
#--------------------------------------------------------------------------------
if function == "pingco":
- r = rc.pingCo().wait()
- print 'pingCo=%r' % (r,)
+ result = rc.pingCo().wait()
+ print 'pingCo=%r\n"%s"' % (result, result)
if function == "findnextprogramco":
- r = rc.findNextProgramCo().wait()
- print 'findNextProgramCo=%r' % (r,)
+ result = rc.findNextProgramCo().wait()
+ print 'findNextProgramCo=%r\n"%s"' % (result, result)
if function == "updatefavoritesscheduleco":
- r = rc.updateFavoritesScheduleCo().wait()
- print 'updateFavoritesScheduleCo=%r' % (r,)
+ result = rc.updateFavoritesScheduleCo().wait()
+ print 'updateFavoritesScheduleCo=%r' % (result,)
if function == "getnextprogramstart":
- r = rc.getNextProgramStart().wait()
- print 'getNextProgramStart=%r' % (r,)
+ result = rc.getNextProgramStart().wait()
+ print 'getNextProgramStart=%r' % (result,)
#--------------------------------------------------------------------------------
# kaa.rpc callback tests
@@ -648,9 +697,9 @@
if function == "findnextprogramnow":
result = rc.findNextProgramNow(True)
- print 'recording:', result
+ print 'recording:%r\n"%s"' % (result, result)
result = rc.findNextProgramNow(False)
- print ' :', result
+ print 'next :%r\n"%s"' % (result, result)
if function == "findnextprogram":
rc.findNextProgram(handler)
@@ -660,7 +709,7 @@
if function == "getscheduledrecordingsnow":
result = rc.getScheduledRecordingsNow()
- print 'result: %r' % (result,)
+ print 'result: %r\n"%s"' % (result, result)
if function == "getscheduledrecordings":
rc.getScheduledRecordings(handler)
@@ -673,14 +722,17 @@
rc.updateFavoritesSchedule(handler)
if function == "findmatchesnow":
- result = rc.findMatchesNow('King of Queens')
+ result = rc.findMatchesNow(args)
+ print '%s: result: %r' % (rc.timeit(start), result)
+
+ if function == "getfavoritesnow":
+ result = rc.getFavoritesNow()
+ print '%s: result: %r' % (rc.timeit(start), result)
+
+ if function == "removefavoritenow":
+ result = rc.removeFavoriteNow()
print '%s: result: %r' % (rc.timeit(start), result)
- if function == "isprogschedulednow":
- schedule = rc.getScheduledRecordingsNow()
- if schedule:
- pass
- #message = rc.isProgScheduledNow(prog, schedule.getProgramList())
#--------------------------------------------------------------------------------
# Twisted xmlrpc tests
Modified: branches/rel-1/freevo/src/tv/tvguide.py
==============================================================================
--- branches/rel-1/freevo/src/tv/tvguide.py (original)
+++ branches/rel-1/freevo/src/tv/tvguide.py Sun Feb 17 17:25:33 2008
@@ -42,7 +42,7 @@
from event import *
import epg_xmltv, epg_types
-import record_client
+from tv.record_client import RecordClient
skin = skin.get_singleton()
skin.register('tv', ('screen', 'title', 'subtitle', 'view',
@@ -79,7 +79,7 @@
break
- self.recordclient = record_client.RecordClient()
+ self.recordclient = RecordClient()
self.col_time = 30 # each col represents 30 minutes
self.n_cols = (stop_time - start_time) / 60 / self.col_time
self.player = player
-------------------------------------------------------------------------
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
