Update of /cvsroot/freevo/freevo/src/tv
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12353
Modified Files:
tvguide.py
Log Message:
cleanup
Index: tvguide.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/tv/tvguide.py,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** tvguide.py 19 Mar 2004 21:03:40 -0000 1.29
--- tvguide.py 5 Jun 2004 18:15:46 -0000 1.30
***************
*** 10,13 ****
--- 10,16 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.30 2004/06/05 18:15:46 dischi
+ # cleanup
+ #
# Revision 1.29 2004/03/19 21:03:40 dischi
# fix tvguide context bug
***************
*** 33,76 ****
# dialog.
#
- # Revision 1.23 2004/02/06 20:55:28 dischi
- # move debug to 2
- #
- # Revision 1.22 2004/01/09 02:10:00 rshortt
- # Patch from Matthieu Weber to revive add/edit favorites support from the
- # TV interface.
- #
- # Revision 1.21 2003/12/04 21:48:11 dischi
- # also add the plugin area
- #
- # Revision 1.20 2003/12/03 21:51:31 dischi
- # register to the skin and rename some skin function calls
- #
- # Revision 1.19 2003/11/16 17:38:48 dischi
- # i18n patch from David Sagnol
- #
- # Revision 1.18 2003/10/21 15:16:17 outlyer
- # A workaround for the problem wherein Twisted Python cannot serialize
- # boolean types.
- #
- # Revision 1.17 2003/10/18 09:34:37 dischi
- # show the current recodings in the guide, RECORD toggles record and remove
- #
- # Revision 1.16 2003/09/13 10:08:23 dischi
- # i18n support
- #
- # Revision 1.15 2003/09/07 15:44:29 dischi
- # add em.MENU_CHANGE_STYLE to toggle styles
- #
- # Revision 1.14 2003/09/05 02:59:09 rshortt
- # Merging in the changes from the new_record branch. The tvguide now uses
- # record_client.py to talk to record_server and no longer uses freevo_record.lst
- # and record_daemon.py. I will attic unused files at a later date.
- #
- # Revision 1.8.2.4 2003/09/05 02:04:26 rshortt
- # Some fixes from the head and add the tv namespace.
- #
- # Revision 1.8.2.3 2003/08/11 19:45:00 rshortt
- # Adding changes form the main branch, perparing to merge.
- #
# -----------------------------------------------------------------------
# Freevo - A Home Theater PC framework
--- 36,39 ----
***************
*** 145,151 ****
self.menuw = menuw
self.visible = True
!
! self.update_schedules(force=True)
self.rebuild(start_time, stop_time, guide.chan_list[0].id, selected)
self.event_context = 'tvmenu'
--- 108,115 ----
self.menuw = menuw
self.visible = True
! self.select_time = start_time
+ self.update_schedules(force=True)
+
self.rebuild(start_time, stop_time, guide.chan_list[0].id, selected)
self.event_context = 'tvmenu'
***************
*** 208,232 ****
if event == em.MENU_UP:
! self.event_UP()
self.menuw.refresh()
elif event == em.MENU_DOWN:
! self.event_DOWN()
self.menuw.refresh()
elif event == em.MENU_LEFT:
! self.event_LEFT()
self.menuw.refresh()
elif event == em.MENU_RIGHT:
! self.event_RIGHT()
self.menuw.refresh()
elif event == em.MENU_PAGEUP:
self.event_PageUp()
self.menuw.refresh()
elif event == em.MENU_PAGEDOWN:
! self.event_PageDown()
self.menuw.refresh()
--- 172,197 ----
if event == em.MENU_UP:
! self.event_change_channel(-1)
self.menuw.refresh()
elif event == em.MENU_DOWN:
! self.event_change_channel(1)
self.menuw.refresh()
elif event == em.MENU_LEFT:
! self.event_change_program(-1)
self.menuw.refresh()
elif event == em.MENU_RIGHT:
! self.event_change_program(1)
self.menuw.refresh()
elif event == em.MENU_PAGEUP:
+ self.event_change_channel(-self.n_items)
self.event_PageUp()
self.menuw.refresh()
elif event == em.MENU_PAGEDOWN:
! self.event_change_channel(self.n_items)
self.menuw.refresh()
***************
*** 384,388 ****
! def event_RIGHT(self):
start_time = self.start_time
stop_time = self.stop_time
--- 349,353 ----
! def event_change_program(self, value):
start_time = self.start_time
stop_time = self.stop_time
***************
*** 393,396 ****
--- 358,365 ----
start_time += (self.col_time * 60)
stop_time += (self.col_time * 60)
+
+ elif last_prg.start <= start_time:
+ start_time -= (self.col_time * 60)
+ stop_time -= (self.col_time * 60)
channel = self.guide.chan_dict[last_prg.channel_id]
***************
*** 408,521 ****
prg = None
! if i < len(programs) - 1:
! prg = programs[i+1]
! else:
! prg = programs[i]
! if prg.sub_title:
! procdesc = '"' + prg.sub_title + '"\n' + prg.desc
! else:
! procdesc = prg.desc
! to_info = (prg.title, procdesc)
! else:
! prg = epg_types.TvProgram()
! prg.channel_id = channel.id
! prg.start = 0
! prg.stop = 2147483647 # Year 2038
! prg.title = CHAN_NO_DATA
! prg.desc = ''
! to_info = CHAN_NO_DATA
!
! self.rebuild(start_time, stop_time, start_channel, prg)
!
!
! def event_LEFT(self):
! start_time = self.start_time
! stop_time = self.stop_time
! start_channel = self.start_channel
! last_prg = self.selected
!
! if last_prg.start <= start_time:
! start_time -= (self.col_time * 60)
! stop_time -= (self.col_time * 60)
!
! channel = self.guide.chan_dict[last_prg.channel_id]
! programs = self.guide.GetPrograms(start_time+1, stop_time-1, [ channel.id ])
! programs = programs[0].programs
! if programs:
! for i in range(len(programs)):
! if programs[i].title == last_prg.title and \
! programs[i].start == last_prg.start and \
! programs[i].stop == last_prg.stop and \
! programs[i].channel_id == last_prg.channel_id:
! break
!
! prg = None
! if i > 0:
! prg = programs[i-1]
! else:
! prg = programs[i]
! if prg.sub_title:
! procdesc = '"' + prg.sub_title + '"\n' + prg.desc
else:
! procdesc = prg.desc
! to_info = (prg.title, procdesc)
! else:
! prg = epg_types.TvProgram()
! prg.channel_id = channel.id
! prg.start = 0
! prg.stop = 2147483647 # Year 2038
! prg.title = CHAN_NO_DATA
! prg.desc = ''
! to_info = CHAN_NO_DATA
!
! self.rebuild(start_time, stop_time, start_channel, prg)
!
!
! def event_DOWN(self):
! start_time = self.start_time
! stop_time = self.stop_time
! start_channel = self.start_channel
! last_prg = self.selected
!
! n = 1
! flag_start_channel = 0
! for i in range(len(self.guide.chan_list)):
! if self.guide.chan_list[i].id == start_channel:
! flag_start_channel = 1
! if self.guide.chan_list[i].id == last_prg.channel_id:
! break
! if flag_start_channel == 1:
! n += 1
!
! if n >= self.n_items and (i-self.n_items+2) < len(self.guide.chan_list):
! start_channel = self.guide.chan_list[i-self.n_items+2].id
! else:
! channel = self.guide.chan_list[i]
!
! channel = None
! if i < len(self.guide.chan_list) - 1:
! channel = self.guide.chan_list[i+1]
! else:
! channel = self.guide.chan_list[i]
!
!
! programs = self.guide.GetPrograms(start_time+1, stop_time-1, [ channel.id ])
! programs = programs[0].programs
!
!
! prg = None
! if programs and len(programs) > 0:
! for i in range(len(programs)):
! if programs[i].stop > last_prg.start and programs[i].stop >
start_time:
! break
-
- prg = programs[i]
if prg.sub_title:
procdesc = '"' + prg.sub_title + '"\n' + prg.desc
else:
procdesc = prg.desc
-
to_info = (prg.title, procdesc)
else:
prg = epg_types.TvProgram()
--- 377,394 ----
prg = None
! if value > 0:
! if i + value < len(programs):
! prg = programs[i+value]
! else:
! prg = programs[-1]
else:
! prg = programs[max(0, i+value)]
if prg.sub_title:
procdesc = '"' + prg.sub_title + '"\n' + prg.desc
else:
procdesc = prg.desc
to_info = (prg.title, procdesc)
+ self.select_time = prg.start
else:
prg = epg_types.TvProgram()
***************
*** 529,537 ****
self.rebuild(start_time, stop_time, start_channel, prg)
!
!
!
!
! def event_UP(self):
start_time = self.start_time
stop_time = self.stop_time
--- 402,407 ----
self.rebuild(start_time, stop_time, start_channel, prg)
!
! def event_change_channel(self, value):
start_time = self.start_time
stop_time = self.stop_time
***************
*** 539,613 ****
last_prg = self.selected
- if last_prg == None:
- last_prg = epg_types.TvProgram()
-
- n = 0
- flag_start_channel = 0
for i in range(len(self.guide.chan_list)):
if self.guide.chan_list[i].id == start_channel:
! flag_start_channel = 1
if self.guide.chan_list[i].id == last_prg.channel_id:
break
- if flag_start_channel == 1:
- n += 1
-
-
- channel = None
- if i > 0:
- channel = self.guide.chan_list[i-1]
- if n == 0:
- start_channel = self.guide.chan_list[i-1].id
-
- else:
- channel = self.guide.chan_list[i]
-
-
- programs = self.guide.GetPrograms(start_time+1, stop_time-1, [ channel.id ])
- programs = programs[0].programs
! if programs and len(programs) > 0:
! for i in range(len(programs)):
! if programs[i].stop > last_prg.start and programs[i].stop >
start_time:
! break
! prg = programs[i]
! if prg.sub_title:
! procdesc = '"' + prg.sub_title + '"\n' + prg.desc
! else:
! procdesc = prg.desc
!
! to_info = (prg.title, procdesc)
! else:
! prg = epg_types.TvProgram()
! prg.channel_id = channel.id
! prg.start = 0
! prg.stop = 2147483647 # Year 2038
! prg.title = _('This channel has no data loaded')
! prg.desc = ''
! to_info = _('This channel has no data loaded')
! self.rebuild(start_time, stop_time, start_channel, prg)
!
!
! def event_PageUp(self):
! start_time = self.start_time
! stop_time = self.stop_time
! start_channel = self.start_channel
! last_prg = self.selected
!
! for i in range(len(self.guide.chan_list)):
! if self.guide.chan_list[i].id == last_prg.channel_id:
! break
!
!
! channel = None
! if i-self.n_items > 0:
! channel = self.guide.chan_list[i-self.n_items]
! start_channel = self.guide.chan_list[i-self.n_items].id
! else:
! channel = self.guide.chan_list[0]
! start_channel = self.guide.chan_list[0].id
!
programs = self.guide.GetPrograms(start_time+1, stop_time-1, [ channel.id ])
--- 409,434 ----
last_prg = self.selected
for i in range(len(self.guide.chan_list)):
if self.guide.chan_list[i].id == start_channel:
! start_pos = i
! end_pos = i + self.n_items
if self.guide.chan_list[i].id == last_prg.channel_id:
break
! channel_pos = min(len(self.guide.chan_list)-2, max(0, i+value))
! # calc real changed value
! value = channel_pos - i
!
! if value < 0 and channel_pos and channel_pos <= start_pos:
! # move start channel up
! start_channel = self.guide.chan_list[start_pos + value].id
+ if value > 0 and channel_pos < len(self.guide.chan_list)-2 and \
+ channel_pos + 1 >= end_pos:
+ # move start channel down
+ start_channel = self.guide.chan_list[start_pos + value].id
! channel = self.guide.chan_list[channel_pos]
programs = self.guide.GetPrograms(start_time+1, stop_time-1, [ channel.id ])
***************
*** 618,622 ****
if programs and len(programs) > 0:
for i in range(len(programs)):
! if programs[i].stop > last_prg.start and programs[i].stop >
start_time:
break
--- 439,443 ----
if programs and len(programs) > 0:
for i in range(len(programs)):
! if programs[i].stop > self.select_time and programs[i].stop >
start_time:
break
***************
*** 639,697 ****
self.rebuild(start_time, stop_time, start_channel, prg)
-
-
-
-
-
- def event_PageDown(self):
- start_time = self.start_time
- stop_time = self.stop_time
- start_channel = self.start_channel
- last_prg = self.selected
-
- n = 1
- flag_start_channel = 0
- for i in range(len(self.guide.chan_list)):
- if self.guide.chan_list[i].id == start_channel:
- flag_start_channel = 1
- if self.guide.chan_list[i].id == last_prg.channel_id:
- break
- if flag_start_channel == 1:
- n += 1
-
- channel = None
- if i+self.n_items < len(self.guide.chan_list):
- channel = self.guide.chan_list[i+self.n_items]
- start_channel = self.guide.chan_list[i+self.n_items].id
- else:
- channel = self.guide.chan_list[i]
- start_channel = self.guide.chan_list[i].id
-
-
- programs = self.guide.GetPrograms(start_time+1, stop_time-1, [ channel.id ])
- programs = programs[0].programs
-
- prg = None
- if programs and len(programs) > 0:
- for i in range(len(programs)):
- if programs[i].stop > last_prg.start and programs[i].stop >
start_time:
- break
-
- prg = programs[i]
- if prg.sub_title:
- procdesc = '"' + prg.sub_title + '"\n' + prg.desc
- else:
- procdesc = prg.desc
-
- to_info = (prg.title, procdesc)
-
- else:
- prg = epg_types.TvProgram()
- prg.channel_id = channel.id
- prg.start = 0
- prg.stop = 2147483647 # Year 2038
- prg.title = CHAN_NO_DATA
- prg.desc = ''
- to_info = CHAN_NO_DATA
-
- self.rebuild(start_time, stop_time, start_channel, prg)
--- 460,461 ----
-------------------------------------------------------
This SF.Net email is sponsored by the new InstallShield X.
>From Windows to Linux, servers to mobile, InstallShield X is the one
installation-authoring solution that does it all. Learn more and
evaluate today! http://www.installshield.com/Dev2Dev/0504
_______________________________________________
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
