Update of /cvsroot/freevo/freevo/src/tv
In directory sc8-pr-cvs1:/tmp/cvs-serv9493
Modified Files:
Tag: new_record
tv.py
Log Message:
Adding changes from the main branch. Preparing to merge.
Index: tv.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/tv/tv.py,v
retrieving revision 1.13.2.2
retrieving revision 1.13.2.3
diff -C2 -d -r1.13.2.2 -r1.13.2.3
*** tv.py 13 Jul 2003 19:38:02 -0000 1.13.2.2
--- tv.py 11 Aug 2003 19:37:26 -0000 1.13.2.3
***************
*** 10,13 ****
--- 10,31 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.13.2.3 2003/08/11 19:37:26 rshortt
+ # Adding changes from the main branch. Preparing to merge.
+ #
+ # 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
***************
*** 75,78 ****
--- 93,98 ----
import rc
+ import tv_util
+
# The Electronic Program Guide
import epg_xmltv as epg
***************
*** 108,111 ****
--- 128,140 ----
+ def get_friendly_channel(channel_id):
+ channel_name = tv_util.get_chan_displayname(channel_id)
+
+ if not channel_name:
+ AlertBox(text='Could not find TV channel %s' % channel_id).show()
+
+ return channel_name
+
+
def start_tv(mode=None, channel_id=None):
tuner_id = get_tunerid(channel_id)
***************
*** 183,187 ****
start_time = self.get_start_time()
! stop_time = self.get_start_time() + 2 * 60 * 60
channels = guide.GetPrograms(start=start_time+1, stop=stop_time-1)
--- 212,216 ----
start_time = self.get_start_time()
! stop_time = self.get_start_time() + config.TVGUIDE_HOURS_PER_PAGE * 60 * 60
channels = guide.GetPrograms(start=start_time+1, stop=stop_time-1)
-------------------------------------------------------
This SF.Net email sponsored by: Free pre-built ASP.NET sites including
Data Reports, E-commerce, Portals, and Forums are available now.
Download today and enter to win an XBOX or Visual Studio .NET.
http://aspnet.click-url.com/go/psa00100003ave/direct;at.aspnet_072303_01/01
_______________________________________________
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
