Update of /cvsroot/freevo/freevo/src/tv
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2990/src/tv
Modified Files:
player.py program.py tvguide.py
Log Message:
use kaa.epg instead of pyepg
Index: program.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/tv/program.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** program.py 12 Jun 2005 18:53:59 -0000 1.12
--- program.py 26 Jun 2005 10:53:00 -0000 1.13
***************
*** 34,37 ****
--- 34,38 ----
# python imports
import time
+ import kaa.epg
# notifier
***************
*** 48,52 ****
from record.client import recordings
import favorite
- import pyepg
class ProgramItem(Item):
--- 49,52 ----
***************
*** 100,104 ****
compare function, return 0 if the objects are identical, 1 otherwise
"""
! if not isinstance(other, (ProgramItem, pyepg.Program)):
return 1
--- 100,104 ----
compare function, return 0 if the objects are identical, 1 otherwise
"""
! if not isinstance(other, (ProgramItem, kaa.epg.Program)):
return 1
Index: tvguide.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/tv/tvguide.py,v
retrieving revision 1.72
retrieving revision 1.73
diff -C2 -d -r1.72 -r1.73
*** tvguide.py 15 Jun 2005 20:44:26 -0000 1.72
--- tvguide.py 26 Jun 2005 10:53:00 -0000 1.73
***************
*** 35,40 ****
import logging
! # pyepg
! import pyepg
# freevo imports
--- 35,39 ----
import logging
! import kaa.epg
# freevo imports
***************
*** 80,84 ****
# current channel is the first one
! self.channel = pyepg.channels[0]
# current program is the current running
--- 79,83 ----
# current channel is the first one
! self.channel = kaa.epg.channels[0]
# current program is the current running
***************
*** 92,96 ****
show the guide
"""
! self.channel = pyepg.get_channel()
self.selected = ProgramItem(self.channel[self.current_time])
self.refresh()
--- 91,95 ----
show the guide
"""
! self.channel = kaa.epg.get_channel()
self.selected = ProgramItem(self.channel[self.current_time])
self.refresh()
***************
*** 113,117 ****
if event == MENU_UP:
! self.channel = pyepg.get_channel(self.channel, -1)
self.selected = ProgramItem(self.channel[self.current_time])
self.refresh()
--- 112,116 ----
if event == MENU_UP:
! self.channel = kaa.epg.get_channel(self.channel, -1)
self.selected = ProgramItem(self.channel[self.current_time])
self.refresh()
***************
*** 119,123 ****
if event == MENU_DOWN:
! self.channel = pyepg.get_channel(self.channel, 1)
self.selected = ProgramItem(self.channel[self.current_time])
self.refresh()
--- 118,122 ----
if event == MENU_DOWN:
! self.channel = kaa.epg.get_channel(self.channel, 1)
self.selected = ProgramItem(self.channel[self.current_time])
self.refresh()
***************
*** 141,145 ****
if event == MENU_PAGEUP:
! self.channel = pyepg.get_channel(self.channel, -9)
self.selected = ProgramItem(self.channel[self.current_time])
self.refresh()
--- 140,144 ----
if event == MENU_PAGEUP:
! self.channel = kaa.epg.get_channel(self.channel, -9)
self.selected = ProgramItem(self.channel[self.current_time])
self.refresh()
***************
*** 147,151 ****
if event == MENU_PAGEDOWN:
! self.channel = pyepg.get_channel(self.channel, 9)
self.selected = ProgramItem(self.channel[self.current_time])
self.refresh()
--- 146,150 ----
if event == MENU_PAGEDOWN:
! self.channel = kaa.epg.get_channel(self.channel, 9)
self.selected = ProgramItem(self.channel[self.current_time])
self.refresh()
Index: player.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/tv/player.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** player.py 13 Dec 2004 01:46:33 -0000 1.5
--- player.py 26 Jun 2005 10:53:00 -0000 1.6
***************
*** 10,13 ****
--- 10,16 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.6 2005/06/26 10:53:00 dischi
+ # use kaa.epg instead of pyepg
+ #
# Revision 1.5 2004/12/13 01:46:33 rshortt
# remove old channel changing code and add some logging
***************
*** 24,28 ****
# Revision 1.1 2004/08/05 17:27:16 dischi
# Major (unfinished) tv update:
! # o the epg is now taken from pyepg in lib
# o all player should inherit from player.py
# o VideoGroups are replaced by channels.py
--- 27,31 ----
# Revision 1.1 2004/08/05 17:27:16 dischi
# Major (unfinished) tv update:
! # o the epg is now taken from kaa.epg in lib
# o all player should inherit from player.py
# o VideoGroups are replaced by channels.py
-------------------------------------------------------
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
