Update of /cvsroot/freevo/freevo/WIP/Ruelle
In directory sc8-pr-cvs1:/tmp/cvs-serv14720
Modified Files:
tvtime.py
Log Message:
removing unneeded and uncalled event stuff
Index: tvtime.py
===================================================================
RCS file: /cvsroot/freevo/freevo/WIP/Ruelle/tvtime.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** tvtime.py 21 Sep 2003 01:06:52 -0000 1.6
--- tvtime.py 24 Sep 2003 22:38:24 -0000 1.7
***************
*** 10,15 ****
# -----------------------------------------------------------------------
# $Log$
! # Revision 1.6 2003/09/21 01:06:52 mikeruelle
! # new thread test
#
# Revision 1.17 2003/09/03 17:54:38 dischi
--- 10,15 ----
# -----------------------------------------------------------------------
# $Log$
! # Revision 1.7 2003/09/24 22:38:24 mikeruelle
! # removing unneeded and uncalled event stuff
#
# Revision 1.17 2003/09/03 17:54:38 dischi
***************
*** 235,241 ****
self.thread = childapp.ChildThread()
self.thread.stop_osd = True
- # self.thread = TVTime_Thread()
- # self.thread.setDaemon(1)
- # self.thread.start()
self.tuner_chidx = 0 # Current channel, index into config.TV_CHANNELS
self.app_mode = 'tv'
--- 235,238 ----
***************
*** 302,328 ****
s_norm = cf_norm.upper()
- # XXX I'm just guessing for some of these, fix later...
- clist_conv = { 'us-bcast' : 'us-broadcast',
- 'us-cable' : 'us-cable',
- 'us-cable-hrc' : 'us-cable',
- 'japan-bcast' : 'japan-broadcast',
- 'japan-cable' : 'japan-cable',
- 'europe-west' : 'europe',
- 'europe-east' : 'europe',
- 'italy' : 'europe',
- 'newzealand' : 'newzealand',
- 'australia' : 'australia',
- 'ireland' : 'europe',
- 'france' : 'france',
- 'china-bcast' : 'europe',
- 'southafrica' : 'europe',
- 'argentina' : 'europe',
- 'canada-cable' : 'us-cable'}
- s_clist = clist_conv.get(cf_clist, 'us-cable')
- if DEBUG:
- print 'TVTIME, using chanlist "%s" for given choice "%s"' %
(cf_clist, s_clist)
-
- # XXX cf_norm, cf_clist doesn't fully correspond to MPlayer!
- # Most of these options are only available in tvtime ver >= 0.9.8
outputplugin = config.CONF.display
--- 299,302 ----
***************
*** 342,347 ****
self.tuner_chidx)
else:
! print 'Mode "%s" is not implemented' % mode # XXX ui.message()
return
--- 316,327 ----
self.tuner_chidx)
+ # BUG need to fix this
+ # if osd.get_fullscreen() == 1:
+ # command += ' -m'
+ # else:
+ # command += ' -M'
+
else:
! print 'Mode "%s" is not implemented' % mode # BUG ui.message()
return
***************
*** 350,354 ****
mixer = plugin.getbyname('MIXER')
! # XXX Mixer manipulation code.
# TV is on line in
# VCR is mic in
--- 330,334 ----
mixer = plugin.getbyname('MIXER')
! # BUG Mixer manipulation code.
# TV is on line in
# VCR is mic in
***************
*** 369,373 ****
# Suppress annoying audio clicks
time.sleep(0.4)
! # XXX Hm.. This is hardcoded and very unflexible.
if mixer and mode == 'vcr':
mixer.setMicVolume(config.VCR_IN_VOLUME)
--- 349,353 ----
# Suppress annoying audio clicks
time.sleep(0.4)
! # BUG Hm.. This is hardcoded and very unflexible.
if mixer and mode == 'vcr':
mixer.setMicVolume(config.VCR_IN_VOLUME)
***************
*** 399,403 ****
self.Stop()
rc.post_event(em.PLAY_END)
! return TRUE
elif event == em.TV_CHANNEL_UP or event == em.TV_CHANNEL_DOWN:
--- 379,383 ----
self.Stop()
rc.post_event(em.PLAY_END)
! return True
elif event == em.TV_CHANNEL_UP or event == em.TV_CHANNEL_DOWN:
***************
*** 413,423 ****
self.thread.app.setchannel('DOWN')
! return TRUE
elif event == em.TOGGLE_OSD:
self.thread.app.write('DISPLAY_INFO\n')
! return TRUE
! return FALSE
--- 393,403 ----
self.thread.app.setchannel('DOWN')
! return True
elif event == em.TOGGLE_OSD:
self.thread.app.write('DISPLAY_INFO\n')
! return True
! return False
***************
*** 455,460 ****
self.write('quit\n')
childapp.ChildApp.kill(self, signal.SIGINT)
-
- # XXX Krister testcode for proper X11 video
if DEBUG: print 'Killing tvtime'
if config.MPLAYER_DEBUG:
--- 435,438 ----
***************
*** 464,499 ****
def stdout_cb(self, line):
- # XXX FIXME to the new event handling
- events = { 'n' : em.MIXER_VOLDOWN,
- 'm' : em.MIXER_VOLUP,
- 'c' : em.TV_CHANNEL_UP,
- 'v' : em.TV_CHANNEL_DOWN,
- 'Escape' : em.STOP,
-
- # 'Up' : rc.UP,
- # 'Down' : rc.DOWN,
- # 'Left' : rc.LEFT,
- # 'Right' : rc.RIGHT,
- # ' ' : rc.SELECT,
- # 'Enter' : rc.SELECT,
-
- 'F3' : em.MIXER_MUTE,
- # 'e' : rc.ENTER,
- # 'd' : rc.DISPLAY,
- 's' : em.STOP }
-
- print 'TVTIME 1 KEY EVENT: "%s"' % str(list(line)) # XXX TEST
-
- if line == 'F10':
- print 'TVTIME screenshot!'
- self.write('screenshot\n')
- else:
- event = events.get(line, None)
- if event is not None:
- rc.post_event(event)
- if DEBUG: print 'posted translated tvtime event "%s"' % event
- else:
- if DEBUG: print 'tvtime cmd "%s" not found!' % line
-
if config.MPLAYER_DEBUG:
try:
--- 442,445 ----
***************
*** 514,517 ****
self.write(cmd)
self.write('enter\n')
-
-
--- 460,461 ----
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
