Author: dmeyer
Date: Sat Jan 20 20:23:17 2007
New Revision: 9021
Modified:
trunk/ui/src/gui/areas/info_area.py
trunk/ui/src/gui/areas/tvlisting_area.py
Log:
fixes to make it work with current tv code
Modified: trunk/ui/src/gui/areas/info_area.py
==============================================================================
--- trunk/ui/src/gui/areas/info_area.py (original)
+++ trunk/ui/src/gui/areas/info_area.py Sat Jan 20 20:23:17 2007
@@ -80,6 +80,9 @@
"""
Update the information area.
"""
+ if not self.infoitem:
+ return
+
if not self.settings.changed and self.infoitem == self.last_item:
self.canvas.rebuild()
return
Modified: trunk/ui/src/gui/areas/tvlisting_area.py
==============================================================================
--- trunk/ui/src/gui/areas/tvlisting_area.py (original)
+++ trunk/ui/src/gui/areas/tvlisting_area.py Sat Jan 20 20:23:17 2007
@@ -100,9 +100,6 @@
self.objects = []
self.background = None
- # FIXME: debug, remove me
- self.__ONE_TIME_DEBUG = True
-
def __calc_items_geometry(self):
# get the settings
@@ -283,15 +280,14 @@
# get tvserver interface
tvserver = freevo.ipc.Instance('freevo').tvserver
- # FIXME: debug, remove me
- if self.__ONE_TIME_DEBUG:
- t1 = time.time()
- log.info('tv listing debug on')
-
# FIXME: move to skin
n_cols = 4
col_time = 30
+ if not self.channels:
+ # FIXME: why?
+ self.channels = kaa.epg.get_channels(sort=True)
+
if self.last_settings == self.settings:
# same layout, only clean 'objects'
for o in self.objects:
@@ -397,15 +393,10 @@
item_h, font_h)
self.last_channels = channel_list
- # FIXME: debug, remove me
- if self.__ONE_TIME_DEBUG:
- t2 = time.time()
-
for channel in channel_list:
try:
#for prg in channel[start_time:stop_time]:
- for prg in kaa.epg.search(channel=channel,
- time=(start_time, stop_time)):
+ for prg in kaa.epg.search(channel=channel, time=(start_time,
stop_time)):
flag_left = 0
flag_right = 0
@@ -506,10 +497,3 @@
# no arrow needed but on the screen, remove it
self.down_arrow.unparent()
self.down_arrow = None
-
- # FIXME: debug, remove me
- if self.__ONE_TIME_DEBUG:
- t3 = time.time()
- log.info('tv listing debug times:\n%s\n%s\n%s' % \
- (t2-t1, t3-t2, t3-t1))
- self.__ONE_TIME_DEBUG = False
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
