Author: duncan
Date: Sun Dec 30 17:45:17 2007
New Revision: 10247

Log:
[ 1858010 ] program menu jumping
Fixed bug report from Valera Koval


Modified:
   branches/rel-1-7/freevo/ChangeLog
   branches/rel-1-7/freevo/src/tv/tvguide.py
   branches/rel-1/freevo/ChangeLog
   branches/rel-1/freevo/src/tv/tvguide.py

Modified: branches/rel-1-7/freevo/ChangeLog
==============================================================================
--- branches/rel-1-7/freevo/ChangeLog   (original)
+++ branches/rel-1-7/freevo/ChangeLog   Sun Dec 30 17:45:17 2007
@@ -23,6 +23,7 @@
  * Updated shut down to allow single key confirmation (F#1857456)
  * Fixed manual record tv plug-in to work in December (B#1858008)
  * Fixed oneclick weather plug-in to allow non-ascii location names (B#1856597)
+ * Fixed tv guide not scrolling to last channel from second channel (B#1858010)
  * Fixed web server favorites and edit_favorite to use name and duplicate 
detection (B#1857394)
 
 == Release 1.7.5 (2007-12-22) ==

Modified: branches/rel-1-7/freevo/src/tv/tvguide.py
==============================================================================
--- branches/rel-1-7/freevo/src/tv/tvguide.py   (original)
+++ branches/rel-1-7/freevo/src/tv/tvguide.py   Sun Dec 30 17:45:17 2007
@@ -567,24 +567,17 @@
 
         channel_pos = min(len(self.guide.chan_list)-1, max(0, i+value))
 
-        # calc real changed value
-        value = channel_pos - i
-
-        if value < 0 and channel_pos >= 0 and channel_pos <= start_pos:
-            # move start channel up
+        if value < 0 and channel_pos >= 0 and channel_pos < start_pos:
             start_channel = self.guide.chan_list[start_pos + value].id
 
-        if value > 0 and channel_pos < len(self.guide.chan_list)-1 and \
-               channel_pos + 1 >= end_pos:
-            # move start channel down
+        if value > 0 and channel_pos < len(self.guide.chan_list)-1 and 
channel_pos+1 >= end_pos:
             start_channel = self.guide.chan_list[start_pos + value].id
 
         channel = self.guide.chan_list[channel_pos]
 
-        programs = self.guide.GetPrograms(start_time+1, stop_time-1,
-                                         [ channel.id ])
-        programs = programs[0].programs
 
+        programs = self.guide.GetPrograms(start_time+1, stop_time-1, [ 
channel.id ])
+        programs = programs[0].programs
 
         prg = None
         if programs and len(programs) > 0:
@@ -592,7 +585,6 @@
                 if programs[i].stop > self.select_time and programs[i].stop > 
start_time:
                     break
 
-
             prg = programs[i]
             if prg.sub_title:
                 procdesc = '"' + prg.sub_title + '"\n' + prg.desc

Modified: branches/rel-1/freevo/ChangeLog
==============================================================================
--- branches/rel-1/freevo/ChangeLog     (original)
+++ branches/rel-1/freevo/ChangeLog     Sun Dec 30 17:45:17 2007
@@ -26,6 +26,7 @@
  * Updated shut down to allow single key confirmation (F#1857456)
  * Fixed manual record tv plug-in to work in December (B#1858008)
  * Fixed oneclick weather plug-in to allow non-ascii location names (B#1856597)
+ * Fixed tv guide not scrolling to last channel from second channel (B#1858010)
  * Fixed web server favorites and edit_favorite to use name and duplicate 
detection (B#1857394)
 
 == Release 1.8.0rc1 (2007-12-22) ==

Modified: branches/rel-1/freevo/src/tv/tvguide.py
==============================================================================
--- branches/rel-1/freevo/src/tv/tvguide.py     (original)
+++ branches/rel-1/freevo/src/tv/tvguide.py     Sun Dec 30 17:45:17 2007
@@ -567,24 +567,17 @@
 
         channel_pos = min(len(self.guide.chan_list)-1, max(0, i+value))
 
-        # calc real changed value
-        value = channel_pos - i
-
-        if value < 0 and channel_pos >= 0 and channel_pos <= start_pos:
-            # move start channel up
+        if value < 0 and channel_pos >= 0 and channel_pos < start_pos:
             start_channel = self.guide.chan_list[start_pos + value].id
 
-        if value > 0 and channel_pos < len(self.guide.chan_list)-1 and \
-               channel_pos + 1 >= end_pos:
-            # move start channel down
+        if value > 0 and channel_pos < len(self.guide.chan_list)-1 and 
channel_pos+1 >= end_pos:
             start_channel = self.guide.chan_list[start_pos + value].id
 
         channel = self.guide.chan_list[channel_pos]
 
-        programs = self.guide.GetPrograms(start_time+1, stop_time-1,
-                                         [ channel.id ])
-        programs = programs[0].programs
 
+        programs = self.guide.GetPrograms(start_time+1, stop_time-1, [ 
channel.id ])
+        programs = programs[0].programs
 
         prg = None
         if programs and len(programs) > 0:
@@ -592,7 +585,6 @@
                 if programs[i].stop > self.select_time and programs[i].stop > 
start_time:
                     break
 
-
             prg = programs[i]
             if prg.sub_title:
                 procdesc = '"' + prg.sub_title + '"\n' + prg.desc

-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog

Reply via email to