Avoiding unnecessary code execution in the replay progress display

4 files changed, 23 insertions, 12 deletions

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 3d1a973f..0a4d6d13 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -23,6 +23,7 @@ Guido Fiala <gfiala@s.netic.de>
  for implementing the SVDRP command 'HITK'
  for implementing image grabbing
  for implementing overlay capabilities (see his 'kvdr' tool at http://www.s.netic.de/gfiala)
+ for making the replay progress display avoid unnecessary code execution
 
 Robert Schneider <Robert.Schneider@lotus.com>
  for implementing EIT support for displaying the current/next info
diff --git a/HISTORY b/HISTORY
index b2d9f489..cd5ef73b 100644
--- a/HISTORY
+++ b/HISTORY
@@ -589,3 +589,5 @@ Video Disk Recorder Revision History
 - Avoiding audio/video distortions in 'Transfer Mode'.
 - Fixed replaying in case there is no index file.
 - Fixed jumping to an editing mark when replay has been paused.
+- Avoiding unnecessary code execution in the replay progress display (thanks
+  to Guido Fiala).
diff --git a/menu.c b/menu.c
index 9385dc39..b6819238 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.84 2001/07/27 13:35:03 kls Exp $
+ * $Id: menu.c 1.85 2001/07/28 13:07:30 kls Exp $
  */
 
 #include "menu.h"
@@ -2144,6 +2144,7 @@ cReplayControl::cReplayControl(void)
 {
   dvbApi = cDvbApi::PrimaryDvbApi;
   visible = shown = displayFrames = false;
+  lastCurrent = lastTotal = -1;
   if (fileName) {
      marks.Load(fileName);
      dvbApi->StartReplay(fileName);
@@ -2204,19 +2205,25 @@ bool cReplayControl::ShowProgress(bool Initial)
         if (title)
            Interface->Write(0, 0, title);
         }
-     Interface->Write(-7, 2, IndexToHMSF(Total));
-     Interface->Flush();
+     if (Total != lastTotal) {
+        Interface->Write(-7, 2, IndexToHMSF(Total));
+        Interface->Flush();
+        lastTotal = Total;
+        }
+     if (Current != lastCurrent) {
 #ifdef DEBUG_OSD
-     int p = Width() * Current / Total;
-     Interface->Fill(0, 1, p, 1, clrGreen);
-     Interface->Fill(p, 1, Width() - p, 1, clrWhite);
+        int p = Width() * Current / Total;
+        Interface->Fill(0, 1, p, 1, clrGreen);
+        Interface->Fill(p, 1, Width() - p, 1, clrWhite);
 #else
-     cProgressBar ProgressBar(Width() * dvbApi->CellWidth(), dvbApi->LineHeight(), Current, Total, marks);
-     Interface->SetBitmap(0, dvbApi->LineHeight(), ProgressBar);
-     Interface->Flush();
+        cProgressBar ProgressBar(Width() * dvbApi->CellWidth(), dvbApi->LineHeight(), Current, Total, marks);
+        Interface->SetBitmap(0, dvbApi->LineHeight(), ProgressBar);
+        Interface->Flush();
 #endif
-     Interface->Write(0, 2, IndexToHMSF(Current, displayFrames));
-     Interface->Flush();
+        Interface->Write(0, 2, IndexToHMSF(Current, displayFrames));
+        Interface->Flush();
+        lastCurrent = Current;
+        }
      return true;
      }
   return false;
diff --git a/menu.h b/menu.h
index 356122e0..c87ecced 100644
--- a/menu.h
+++ b/menu.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.h 1.18 2001/02/11 10:30:35 kls Exp $
+ * $Id: menu.h 1.19 2001/07/28 13:03:39 kls Exp $
  */
 
 #ifndef _MENU_H
@@ -83,6 +83,7 @@ private:
   cDvbApi *dvbApi;
   cMarks marks;
   bool visible, shown, displayFrames;
+  int lastCurrent, lastTotal;
   void Show(void);
   void Hide(void);
   static char *fileName;