Merge branch 'master' of git://projects.vdr-developer.org/vdr-plugin-skindesigner

1 files changed, 1 insertions, 50 deletions

diff --git a/displayreplay.c b/displayreplay.c
index 53a43d8..5a82eea 100644
--- a/displayreplay.c
+++ b/displayreplay.c
@@ -5,8 +5,6 @@ cSDDisplayReplay::cSDDisplayReplay(cTemplate *replayTemplate, bool ModeOnly) {
     doOutput = true;
     initial = true;
     modeOnly = ModeOnly;
-    numMarksLast = 0;
-    lastMarks = NULL;
     if (!replayTemplate) {
         doOutput = false;
         esyslog("skindesigner: displayReplay no valid template - aborting");
@@ -24,9 +22,6 @@ cSDDisplayReplay::~cSDDisplayReplay() {
     if (!doOutput)
         return;
     delete replayView;
-    if (lastMarks) {
-        delete[] lastMarks;
-    }
 }
 
 void cSDDisplayReplay::SetRecording(const cRecording *Recording) {
@@ -47,9 +42,7 @@ void cSDDisplayReplay::SetProgress(int Current, int Total) {
     if (!doOutput)
         return;
     replayView->DrawProgressBar(Current, Total);
-    if (MarksChanged()) {
-        replayView->DrawMarks(marks, Total);
-    }
+    replayView->DrawMarks(marks, Current, Total);
 }
 
 void cSDDisplayReplay::SetCurrent(const char *Current) {
@@ -87,45 +80,3 @@ void cSDDisplayReplay::Flush(void) {
         replayView->Flush();
     }
 }
-
-/****************************************************************************************
-* Private Functions
-*****************************************************************************************/
-
-bool cSDDisplayReplay::MarksChanged(void) {
-    if (!marks)
-        return false;
-    int numMarks = marks->Count();
-    if (numMarks != numMarksLast) {
-        RememberMarks();
-        return true;
-    }
-    if (!lastMarks)
-        return false;
-    int i=0;
-    for (const cMark *m = marks->First(); m; m = marks->Next(m)) {
-        if (m->Position() != lastMarks[i]) {
-            RememberMarks();
-            return true;
-        }
-        i++;
-    }
-    return false;
-}
-
-void cSDDisplayReplay::RememberMarks(void) {
-    if (!marks)
-        return;
-    numMarksLast = marks->Count();
-    if (numMarksLast < 1)
-        return;
-    if (lastMarks) {
-        delete[] lastMarks;
-    }
-    lastMarks = new int[numMarksLast];
-    int i=0;
-    for (const cMark *m = marks->First(); m; m = marks->Next(m)) {
-        lastMarks[i] = m->Position();
-        i++;
-    }
-}