Update of /cvsroot/freevo/freevo/src/tv
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25761
Modified Files:
tvmenu.py channels.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: tvmenu.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/tv/tvmenu.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** tvmenu.py 11 Jan 2004 15:44:01 -0000 1.12
--- tvmenu.py 4 Feb 2004 14:11:18 -0000 1.13
***************
*** 10,13 ****
--- 10,21 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.13 2004/02/04 14:11:18 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.12 2004/01/11 15:44:01 dischi
# changed menu display type to 'x main menu'
***************
*** 16,98 ****
# Patch from Matthieu Weber to revive add/edit favorites support from the
# TV interface.
- #
- # Revision 1.10 2003/12/31 16:10:30 rshortt
- # Make it possible to have a tv mainmenu plugin.
- #
- # Revision 1.9 2003/11/28 19:26:37 dischi
- # renamed some config variables
- #
- # Revision 1.8 2003/11/06 06:08:38 krister
- # Added testcode for viewing the VCR/Composite1 input on the TV card
- #
- # Revision 1.7 2003/10/20 01:41:55 rshortt
- # Moving tv_util from src/tv/ to src/util/.
- #
- # Revision 1.6 2003/09/13 10:08:23 dischi
- # i18n support
- #
- # Revision 1.5 2003/09/05 20:07:08 dischi
- # don't show tv guide item when there are no channels
- #
- # Revision 1.4 2003/09/05 02:06:36 rshortt
- # renaming tv.py to tvmenu.py because it is already in the 'tv.' namespace
- # and that breaks things. also added tv. namespace usage.
- #
- # This file is from tv.py on the new_record branch which I am merging to the head.
- #
- # Revision 1.13.2.4 2003/08/21 00:52:36 rshortt
- # Minor update from the main branch.
- #
- # Revision 1.13.2.3 2003/08/11 19:37:26 rshortt
- # Adding changes from the main branch. Preparing to merge.
- #
- # Revision 1.17 2003/08/20 22:29:37 gsbarbieri
- # UPPER CASE TEXT IS UGLY! :)
- #
- # Revision 1.16 2003/08/03 11:10:26 dischi
- # Added TVGUIDE_HOURS_PER_PAGE
- #
- # Revision 1.15 2003/07/13 19:46:21 rshortt
- # Move the work portion of get_friendly_channel() into tv_util.
- #
- # Revision 1.14 2003/06/29 15:01:31 outlyer
- # Display the channel's friendly (display name) in the tuner popupbox.
- #
- # Since XMLTV 0.6.11 uses what they call "RFC" channel names which are
- # very long and don't reveal much about the channel.
- #
- # This will obviously have no regressive effect, since users had the
- # friendly name before.
- #
- # Revision 1.13.2.2 2003/07/13 19:38:02 rshortt
- # Remove the 'View Favorites' screen until I fix some nasties with regard
- # to the edit favorites screen.
- #
- # Revision 1.13.2.1 2003/06/03 02:11:48 rshortt
- # Committing to a branch tag: new_record
- # These changes enable the new program recording / informations popups which
- # use record_server.
- #
- # Revision 1.13 2003/06/02 21:29:22 outlyer
- # Changed the "Schedule Editor" to show up in the TV Submenu, along with "Guide" and
- # "Recorded Shows" which makes a lot more sense then where it was before, which was
- # also exceptionally well hidden.
- #
- # To do this properly, I also had to move record_schedule into a class, subclassing
- # from Item, and so problems may and possibly will arise. I've tested it a little,
- # but please bang on this, because while it's a relatively minor change, it does
- # get things working inside the properly model, at least for a start.
- #
- # Bug reports are expected and welcome :)
- #
- # Revision 1.12 2003/04/24 19:56:42 dischi
- # comment cleanup for 1.3.2-pre4
- #
- # Revision 1.11 2003/04/22 19:34:12 dischi
- # mplayer and tvtime are now plugins
- #
- # Revision 1.10 2003/04/21 18:20:44 dischi
- # make tv itself and not tv.tv the plugin (using __init__.py)
- #
# -----------------------------------------------------------------------
# Freevo - A Home Theater PC framework
--- 24,27 ----
***************
*** 176,180 ****
def start_tv(mode=None, channel_id=None):
tuner_id = get_tunerid(channel_id)
- print 'mode=%s channel=%s tuner=%s' % (mode, channel_id, tuner_id)
plugin.getbyname(plugin.TV).Play(mode, tuner_id)
--- 105,108 ----
Index: channels.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/tv/channels.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** channels.py 31 Dec 2003 16:08:08 -0000 1.11
--- channels.py 4 Feb 2004 14:11:19 -0000 1.12
***************
*** 10,13 ****
--- 10,21 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.12 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.11 2003/12/31 16:08:08 rshortt
# Use a fifth field in TV_CHANNELS to specify an optional VideoGroup
***************
*** 17,61 ****
# Make plugin_external_tuner work again.
#
- # Revision 1.9 2003/11/25 09:34:07 krister
- # Changed the frequency returned to be kHz instead of a scaled value
- #
- # Revision 1.8 2003/11/24 17:16:40 rshortt
- # Bugfixes.
- #
- # Revision 1.7 2003/11/24 04:41:14 krister
- # Commented out a part that crashes the TV viewer plugin. Please fix!
- #
- # Revision 1.6 2003/11/23 21:19:57 rshortt
- # Bugfix - it returned to early if using an external tuner with the v4l
- # tuner as the input.
- #
- # Revision 1.5 2003/11/23 20:47:13 rshortt
- # Another typo!
- #
- # Revision 1.4 2003/11/23 20:46:07 rshortt
- # Dumb typo.
- #
- # Revision 1.3 2003/11/23 19:21:49 rshortt
- # Add getChannelInfo, taken from a method of the mplayer tv plugin. I have
- # some changes to that as well which will use this one instead.
- #
- # Revision 1.2 2003/11/16 17:38:48 dischi
- # i18n patch from David Sagnol
- #
- # Revision 1.1 2003/10/11 14:55:29 rshortt
- # A new module to handle all of the channel requirements of Freevo from
- # one place. This will also be used as a layer between Freevo's channel
- # list, frequency table, and custom frequencies and childapps like mplayer
- # or tvtime.
- #
- # This is not used by anything by default and requires further work.
- #
- # Revision 1.2 2003/10/06 02:57:21 rshortt
- # Almost in action...
- #
- # Revision 1.1 2003/09/19 02:22:20 rshortt
- # thinking out loud
- #
- #
#
# -----------------------------------------------------------------------
--- 25,28 ----
***************
*** 84,87 ****
--- 51,55 ----
import tv.freq, tv.v4l2
import epg_xmltv
+ import time
DEBUG = config.DEBUG
-------------------------------------------------------
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
