summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--coreengine/viewdisplayreplay.c9
-rw-r--r--coreengine/viewdisplayreplay.h1
-rw-r--r--displayreplay.c9
-rw-r--r--displayreplay.h1
4 files changed, 4 insertions, 16 deletions
diff --git a/coreengine/viewdisplayreplay.c b/coreengine/viewdisplayreplay.c
index 02d0998..30986bb 100644
--- a/coreengine/viewdisplayreplay.c
+++ b/coreengine/viewdisplayreplay.c
@@ -154,7 +154,6 @@ void cViewReplay::ClearVariables(void) {
lastFlush = 0;
lastFlushModeOnly = 0;
message = false;
- reclength = -1;
timeShiftActive = false;
timeShiftFramesTotal = -1;
timeShiftLength = -1;
@@ -216,7 +215,7 @@ void cViewReplay::SetTimeShiftValues(int current, int total) {
time_t liveEventStop = eventEnde->EndTime();
// Begin of timeshift recording
time_t recordingStart = time(0) - recording->LengthInSeconds();
- // actual timeshiftlength
+ // actual timeshiftlength in sec
timeShiftLength = liveEventStop - recordingStart;
// timeshiftlength until end of live program
timeShiftFramesTotal = total * ((double)timeShiftLength / (double)recording->LengthInSeconds());
@@ -275,7 +274,7 @@ void cViewReplay::SetTotal(const char *total) {
}
void cViewReplay::SetTimeshiftTimes(int current, int total) {
- if (!veTimeshiftTimes || reclength == 0)
+ if (!veTimeshiftTimes || !recording)
return;
time_t recordingStart = 0;
time_t playbackTime = 0;
@@ -289,10 +288,10 @@ void cViewReplay::SetTimeshiftTimes(int current, int total) {
}
void cViewReplay::SetEndTime(int current, int total) {
- if (!veEndTime || reclength == 0)
+ if (!veEndTime || !recording)
return;
int totalLength = total;
- int recordingLength = reclength;
+ int recordingLength = recording->LengthInSeconds();
if (timeShiftActive && timeShiftFramesTotal > 0) {
totalLength = timeShiftFramesTotal;
recordingLength = timeShiftLength;
diff --git a/coreengine/viewdisplayreplay.h b/coreengine/viewdisplayreplay.h
index 5746ac2..8e61f3b 100644
--- a/coreengine/viewdisplayreplay.h
+++ b/coreengine/viewdisplayreplay.h
@@ -46,7 +46,6 @@ public:
virtual ~cViewReplay(void);
void PreCache(void);
void SetModeOnly(bool modeOnly) { this->modeOnly = modeOnly; };
- void SetRecordingLength(int length) { reclength = length; };
void SetRecording(const cRecording *recording);
void SetTimeShiftValues(int current, int total);
void SetTitle(const char *title);
diff --git a/displayreplay.c b/displayreplay.c
index 37e87ff..60079ff 100644
--- a/displayreplay.c
+++ b/displayreplay.c
@@ -1,7 +1,6 @@
#include "displayreplay.h"
cSDDisplayReplay::cSDDisplayReplay(cViewReplay *replayView, bool ModeOnly) {
- init = true;
view = replayView;
ok = view->Init();
if (!ok)
@@ -16,10 +15,6 @@ cSDDisplayReplay::~cSDDisplayReplay() {
void cSDDisplayReplay::SetRecording(const cRecording *Recording) {
if (ok) {
view->SetRecording(Recording);
- if (init) {
- view->SetRecordingLength(Recording->LengthInSeconds());
- init = false;
- }
}
}
@@ -27,10 +22,6 @@ void cSDDisplayReplay::SetTitle(const char *Title) {
if (!ok)
return;
view->SetTitle(Title);
- if (init) {
- view->SetRecordingLength(0);
- init = false;
- }
}
void cSDDisplayReplay::SetMode(bool Play, bool Forward, int Speed) {
diff --git a/displayreplay.h b/displayreplay.h
index 1ee635d..10f086d 100644
--- a/displayreplay.h
+++ b/displayreplay.h
@@ -8,7 +8,6 @@
class cSDDisplayReplay : public cSkinDisplayReplay {
private:
bool ok;
- bool init;
cViewReplay *view;
public:
cSDDisplayReplay(cViewReplay *replayView, bool ModeOnly);