From 76521306b1c8bc2c357bdb7cecc7dd6c276138e5 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <vdr@tvdr.de>
Date: Sat, 24 Feb 2001 16:26:11 +0100
Subject: [PATCH] Paging up/down in lists no longer wraps

---
 BUGS    |  8 --------
 HISTORY |  2 +-
 TODO    |  7 -------
 osd.c   | 14 +++++---------
 4 files changed, 6 insertions(+), 25 deletions(-)
 delete mode 100644 BUGS
 delete mode 100644 TODO

diff --git a/BUGS b/BUGS
deleted file mode 100644
index 506316a5..00000000
--- a/BUGS
+++ /dev/null
@@ -1,8 +0,0 @@
-Video Disk Recorder - Known Bugs
---------------------------------
-
-* Sometimes the picture "jumps" as if a frame is skipped.
-  Presumably this is a problem in the card driver or firmware?
-
-* The pictures captured with the GRAB command in SVDRP
-  appear to be too dark.
diff --git a/HISTORY b/HISTORY
index 02a43624..684d2b65 100644
--- a/HISTORY
+++ b/HISTORY
@@ -366,7 +366,7 @@ Video Disk Recorder Revision History
   a certain instance of VDR shall use.
 - The "Left" and "Right" keys are now used to page up and down in lists (thanks
   to Martin Hammerschmid). Since the "Timers" menu already uses these keys to
-  (de)activate timers, this functionality is not available here.
+  (de)activate timers, this functionality is not available there.
 - The "Main" and "Commands" menu now support "hotkeys", which means that if the
   first non-blank character of a menu item is a digit in the range 1..9, that
   item can be selected by pressing the respective numeric key on the remote
diff --git a/TODO b/TODO
deleted file mode 100644
index 1ae7d717..00000000
--- a/TODO
+++ /dev/null
@@ -1,7 +0,0 @@
-TODO list for the Video Disk Recorder project
----------------------------------------------
-
-* Implement simultaneous record/replay with a single DVB card once
-  the card driver/firmware allows this.
-* Implement channel scanning.
-* Implement remaining commands in SVDRP.
diff --git a/osd.c b/osd.c
index bc3d1878..c29c9831 100644
--- a/osd.c
+++ b/osd.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.c 1.15 2001/02/03 15:14:45 kls Exp $
+ * $Id: osd.c 1.16 2001/02/24 16:26:11 kls Exp $
  */
 
 #include "osd.h"
@@ -257,13 +257,10 @@ void cOsdMenu::PageUp(void)
 {
   if (Count() <= MAXOSDITEMS)
      return;
-  int relpos = current - first;
   current -= MAXOSDITEMS;
   first -= MAXOSDITEMS;
-  if (first < 0) {
-     first = Count() - MAXOSDITEMS;
-     current = first + relpos; 
-     }
+  if (first < 0)
+     first = current = 0;
   Display();
   DisplayCurrent(true);
 }
@@ -272,12 +269,11 @@ void cOsdMenu::PageDown(void)
 {
   if (Count() <= MAXOSDITEMS)
      return;
-  int relpos = current - first;
   current += MAXOSDITEMS;
   first += MAXOSDITEMS;
   if (current > Count() - 1) {
-     first = 0;
-     current = first + relpos;
+     current = Count() - 1;
+     first = Count() - MAXOSDITEMS;
      }
   Display();
   DisplayCurrent(true);