Update of /cvsroot/freevo/freevo/src/tv/plugins
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv765
Modified Files:
tvtime.py
Log Message:
initial videogroups support.
Index: tvtime.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/tv/plugins/tvtime.py,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** tvtime.py 6 Feb 2004 01:15:06 -0000 1.30
--- tvtime.py 20 Feb 2004 17:41:36 -0000 1.31
***************
*** 10,13 ****
--- 10,16 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.31 2004/02/20 17:41:36 mikeruelle
+ # initial videogroups support.
+ #
# Revision 1.30 2004/02/06 01:15:06 mikeruelle
# use new events in tv context
***************
*** 113,116 ****
--- 116,120 ----
import tv.epg_xmltv as epg # The Electronic Program Guide
import event as em
+ from tv.channels import FreevoChannels
import plugin
***************
*** 232,236 ****
tvtimexml = os.path.join(os.environ['HOME'], '.tvtime', 'tvtime.xml')
configcmd = os.path.join(os.path.dirname(config.TVTIME_CMD),
"tvtime-configure")
! cf_norm, cf_input, cf_clist, cf_device = config.TV_SETTINGS.split()
s_norm = cf_norm.upper()
daoptions = ''
--- 236,245 ----
tvtimexml = os.path.join(os.environ['HOME'], '.tvtime', 'tvtime.xml')
configcmd = os.path.join(os.path.dirname(config.TVTIME_CMD),
"tvtime-configure")
! #cf_norm, cf_input, cf_clist, cf_device = config.TV_SETTINGS.split()
! fc = FreevoChannels()
! vg = fc.getVideoGroup(config.TV_CHANNELS[0][2])
! cf_norm = vg.tuner_norm
! cf_input = vg.input_num
! cf_device = vg.vdev
s_norm = cf_norm.upper()
daoptions = ''
***************
*** 399,403 ****
self.tuner_chidx = 0 # Current channel, index into config.TV_CHANNELS
self.app_mode = 'tv'
!
def TunerSetChannel(self, tuner_channel):
--- 408,413 ----
self.tuner_chidx = 0 # Current channel, index into config.TV_CHANNELS
self.app_mode = 'tv'
! self.fc = FreevoChannels()
! self.current_vg = None
def TunerSetChannel(self, tuner_channel):
***************
*** 447,463 ****
if tuner_channel != None:
-
try:
self.TunerSetChannel(tuner_channel)
except ValueError:
pass
# if mode == 'tv' or mode == 'vcr':
if mode == 'tv':
- tuner_channel = self.TunerGetChannel()
-
w, h = config.TV_VIEW_SIZE
! cf_norm, cf_input, cf_clist, cf_device = config.TV_SETTINGS.split()
s_norm = cf_norm.upper()
--- 457,477 ----
if tuner_channel != None:
try:
self.TunerSetChannel(tuner_channel)
except ValueError:
pass
+ if not tuner_channel:
+ tuner_channel = self.fc.getChannel()
+ vg = self.current_vg = self.fc.getVideoGroup(tuner_channel)
+
# if mode == 'tv' or mode == 'vcr':
if mode == 'tv':
w, h = config.TV_VIEW_SIZE
! #cf_norm, cf_input, cf_clist, cf_device = config.TV_SETTINGS.split()
! cf_norm = vg.tuner_norm
! cf_input = vg.input_num
! cf_device = vg.vdev
s_norm = cf_norm.upper()
***************
*** 471,475 ****
outputplugin = 'directfb'
! command = '%s -D %s -k -I %s -n %s -d %s -f %s -c %s' %
(config.TVTIME_CMD,
outputplugin,
w,
--- 485,489 ----
outputplugin = 'directfb'
! command = '%s -D %s -k -I %s -n %s -d %s -f %s -c %s -i %s' %
(config.TVTIME_CMD,
outputplugin,
w,
***************
*** 477,481 ****
cf_device,
'freevo',
! self.tuner_chidx)
if osd.get_fullscreen() == 1:
--- 491,496 ----
cf_device,
'freevo',
! self.tuner_chidx,
! cf_input)
if osd.get_fullscreen() == 1:
-------------------------------------------------------
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps & Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356&alloc_id=3438&op=click
_______________________________________________
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
