summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2001-08-04 08:08:44 +0200
committerKlaus Schmidinger <vdr@tvdr.de>2001-08-04 08:08:44 +0200
commit614113cdcb1ebb176891664426e9c0cc2bb63c9d (patch)
tree2856314f859d1966169d298a3e39c6b1e58da821
parentbff17fb1d0e39583e44ba93ea214d7434ecef2ce (diff)
downloadvdr-614113cdcb1ebb176891664426e9c0cc2bb63c9d.tar.gz
vdr-614113cdcb1ebb176891664426e9c0cc2bb63c9d.tar.bz2
Fixed replay progress display in case replay is paused while watching an ongoing recording; initial display comes up in one piece
-rw-r--r--HISTORY3
-rw-r--r--menu.c12
2 files changed, 9 insertions, 6 deletions
diff --git a/HISTORY b/HISTORY
index 58ced4ef..8e6777f2 100644
--- a/HISTORY
+++ b/HISTORY
@@ -616,4 +616,5 @@ Video Disk Recorder Revision History
for this suggestion).
- Added support for replaying DVDs (thanks to Andreas Schultz). VDR now needs
the 'libdvdread' library to be installed.
-
+- Fixed replay progress display in case replay is paused while watching an
+ ongoing recording.
diff --git a/menu.c b/menu.c
index b09714a1..74dbedec 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.90 2001/08/03 14:18:08 kls Exp $
+ * $Id: menu.c 1.91 2001/08/04 08:08:44 kls Exp $
*/
#include "menu.h"
@@ -2314,10 +2314,10 @@ bool cReplayControl::ShowProgress(bool Initial)
}
if (Total != lastTotal) {
Interface->Write(-7, 2, IndexToHMSF(Total));
- Interface->Flush();
- lastTotal = Total;
+ if (!Initial)
+ Interface->Flush();
}
- if (Current != lastCurrent) {
+ if (Current != lastCurrent || Total != lastTotal) {
#ifdef DEBUG_OSD
int p = Width() * Current / Total;
Interface->Fill(0, 1, p, 1, clrGreen);
@@ -2325,12 +2325,14 @@ bool cReplayControl::ShowProgress(bool Initial)
#else
cProgressBar ProgressBar(Width() * dvbApi->CellWidth(), dvbApi->LineHeight(), Current, Total, marks);
Interface->SetBitmap(0, dvbApi->LineHeight(), ProgressBar);
- Interface->Flush();
+ if (!Initial)
+ Interface->Flush();
#endif
Interface->Write(0, 2, IndexToHMSF(Current, displayFrames));
Interface->Flush();
lastCurrent = Current;
}
+ lastTotal = Total;
return true;
}
return false;