Update of /cvsroot/freevo/freevo/src/tv/plugins
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25761/plugins
Modified Files:
mplayer.py
Log Message:
Cleanup and fixup:
o Now uses the mplayer OSD to show channel information when changing channels,
or you press the 'display' key.
o Removed many old CVS log messages
o Removed many debug-related 'print' statements
Index: mplayer.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/tv/plugins/mplayer.py,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** mplayer.py 31 Dec 2003 16:13:15 -0000 1.30
--- mplayer.py 4 Feb 2004 14:11:19 -0000 1.31
***************
*** 10,13 ****
--- 10,21 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.31 2004/02/04 14:11:19 outlyer
+ # Cleanup and fixup:
+ #
+ # o Now uses the mplayer OSD to show channel information when changing channels,
+ # or you press the 'display' key.
+ # o Removed many old CVS log messages
+ # o Removed many debug-related 'print' statements
+ #
# Revision 1.30 2003/12/31 16:13:15 rshortt
# Make it possible to change channels between those that have different
***************
*** 17,82 ****
# cable channels and channel+ through to my satellite channels.
#
- # Revision 1.29 2003/11/27 03:11:08 rshortt
- # Shuffle things around a little bit and add ivtv capabilities. I intend to
- # depricate the ivtv_basic_tv plugin in favour of this once since that is
- # just an mplayer plugin as well and I don't want to duplicate too much code.
- #
- # I will focus my development effort on this plugin instead of ivtv_basic_tv
- # and will also be really using this one so I can test it out myself. :)
- #
- # I am planning on adding dvb support to this plugin as well.
- #
- # Revision 1.28 2003/11/25 09:37:00 krister
- # Bugfixes, works for me now
- #
- # Revision 1.26.2.3 2003/11/25 01:24:12 rshortt
- # Some further fixes and improvements, aldo removed MPLAYER_DEBUG since
- # ChildApp does this now.
- #
- # Please test if you can. VideoGroup configuration is still much undocumented
- # but I am planning to do so. Ping me if you need a quick hand.
- #
- # To test this you must check it out by:
- # cvs update -r rob src/tv/plugins/mplayer.py
- #
- # Revision 1.26.2.2 2003/11/24 17:16:40 rshortt
- # Bugfixes.
- #
- # Revision 1.26.2.1 2003/11/24 13:25:00 rshortt
- # Some unstable changes on a branch.
- #
- # Revision 1.24 2003/11/23 19:53:01 rshortt
- # Move some code into src/tv/channels.py and also make use of Freevo's
- # frequency tables (and custom frequencies).
- #
- # This plugin indirectly makes use of the new VIDEO_GROUPS config item.
- #
- # Please test. I don't have the setup to test this myself.
- #
- # Revision 1.23 2003/11/06 06:08:38 krister
- # Added testcode for viewing the VCR/Composite1 input on the TV card
- #
- # Revision 1.22 2003/10/28 16:08:14 mikeruelle
- # convert to new thread system
- #
- # Revision 1.21 2003/10/12 09:54:27 dischi
- # BSD patches from Lars
- #
- # Revision 1.20 2003/09/14 01:38:59 outlyer
- # More FreeBSD support from Lars
- #
- # Revision 1.19 2003/09/03 17:54:38 dischi
- # Put logfiles into LOGDIR not $FREEVO_STARTDIR because this variable
- # doesn't exist anymore.
- #
- # Revision 1.18 2003/09/02 20:29:53 dischi
- # only use mixer if we have one
- #
- # Revision 1.17 2003/09/01 19:46:03 dischi
- # add menuw to eventhandler, it may be needed
- #
- # Revision 1.16 2003/08/23 12:51:43 dischi
- # removed some old CVS log messages
- #
#
# -----------------------------------------------------------------------
--- 25,28 ----
***************
*** 118,122 ****
from tv.channels import FreevoChannels
import tv.ivtv as ivtv
!
import plugin
--- 64,68 ----
from tv.channels import FreevoChannels
import tv.ivtv as ivtv
! import time
import plugin
***************
*** 158,169 ****
def Play(self, mode, tuner_channel=None):
- print 'PLAY CHAN: %s' % tuner_channel
-
if not tuner_channel:
tuner_channel = self.fc.getChannel()
- print 'PLAY CHAN: %s' % tuner_channel
vg = self.current_vg = self.fc.getVideoGroup(tuner_channel)
- print 'PLAY GROUP: %s' % vg.desc
# Convert to MPlayer TV setting strings
--- 104,111 ----
***************
*** 184,188 ****
ivtv_dev.init_settings()
ivtv_dev.setinput(vg.input_num)
! ivtv_dev.print_settings()
self.fc.chanSet(tuner_channel)
--- 126,130 ----
ivtv_dev.init_settings()
ivtv_dev.setinput(vg.input_num)
! #ivtv_dev.print_settings()
self.fc.chanSet(tuner_channel)
***************
*** 226,230 ****
args += (tvcmd,)
!
mpl = '--prio=%s %s -vo %s%s -fs %s -slave %s' % args
--- 168,172 ----
args += (tvcmd,)
!
mpl = '--prio=%s %s -vo %s%s -fs %s -slave %s' % args
***************
*** 286,295 ****
osd.focused_app().show()
- print 'stopped %s app' % self.mode
if os.path.exists('/tmp/freevo.wid'): os.unlink('/tmp/freevo.wid')
def eventhandler(self, event, menuw=None):
- print '%s: %s app got %s event' % (time.time(), self.mode, event)
if event == em.STOP or event == em.PLAY_END:
self.Stop()
--- 228,235 ----
***************
*** 304,313 ****
nextchan = self.fc.getPrevChannel()
- print 'NEXT CHAN: %s' % nextchan
nextvg = self.fc.getVideoGroup(nextchan)
- print 'NEXT GROUP: %s' % nextvg.desc
if self.current_vg != nextvg:
- print 'NEW GROUP!'
self.Stop(channel_change=1)
self.Play('tv', nextchan)
--- 244,250 ----
***************
*** 329,351 ****
# Display a channel changed message
! # XXX Experimental, disabled for now
! #tuner_id, chan_name, prog_info = self.fc.getChannelInfo()
! #now = time.strftime('%H:%M')
! #msg = '%s %s (%s): %s' % (now, chan_name, tuner_id, prog_info)
! #cmd = 'show_osd_msg "%s" 4000\n' % msg
! #self.thread.app.write(cmd)
return TRUE
elif event == em.TOGGLE_OSD:
- return FALSE
-
# Display the channel info message
- # XXX Experimental, disabled for now
tuner_id, chan_name, prog_info = self.fc.getChannelInfo()
now = time.strftime('%H:%M')
msg = '%s %s (%s): %s' % (now, chan_name, tuner_id, prog_info)
! cmd = 'show_osd_msg "%s" 4000\n' % msg
! print 'msg = "%s" %s chars' % (msg, len(msg))
self.thread.app.write(cmd)
return FALSE
--- 266,284 ----
# Display a channel changed message
! tuner_id, chan_name, prog_info = self.fc.getChannelInfo()
! now = time.strftime('%H:%M')
! msg = '%s %s (%s): %s' % (now, chan_name, tuner_id, prog_info)
! cmd = 'osd_show_text "%s"\n' % msg
! self.thread.app.write(cmd)
return TRUE
elif event == em.TOGGLE_OSD:
# Display the channel info message
tuner_id, chan_name, prog_info = self.fc.getChannelInfo()
now = time.strftime('%H:%M')
msg = '%s %s (%s): %s' % (now, chan_name, tuner_id, prog_info)
! cmd = 'osd_show_text "%s"\n' % msg
self.thread.app.write(cmd)
+ return FALSE
return FALSE
-------------------------------------------------------
The SF.Net email is sponsored by EclipseCon 2004
Premiere Conference on Open Tools Development and Integration
See the breadth of Eclipse activity. February 3-5 in Anaheim, CA.
http://www.eclipsecon.org/osdn
_______________________________________________
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
