frodovdr/vdr-plugin-skindesigner
1
0
Fork 0
mirror of https://projects.vdr-developer.org/git/vdr-plugin-skindesigner.git synced 2023-10-19 17:58:31 +02:00
Code Issues Releases Wiki Activity

Fixed a bug in timeshift mode that prevented the progress bar from updating in pause mode

Browse Source
This commit is contained in:
kamel5 2021-02-08 15:22:40 +01:00
parent 6972a59e1b
commit c3f7a2cfdf
4 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
coreengine/viewdisplayreplay.c
View File

@ -142,6 +142,7 @@ void cViewReplay::PreCache(void) {
void cViewReplay::ClearVariables(void) { void cViewReplay::ClearVariables(void) {
cView::ClearVariables(); cView::ClearVariables();
recording = NULL;
modeOnly = false; modeOnly = false;
lastFlush = 0; lastFlush = 0;
lastFlushModeOnly = 0; lastFlushModeOnly = 0;
@ -171,6 +172,7 @@ void cViewReplay::SetTimeShift(int framesTotal, int timeShiftLength) {
} }
void cViewReplay::SetRecording(const cRecording *recording) { void cViewReplay::SetRecording(const cRecording *recording) {
this->recording = recording;
if (veRecTitle) { if (veRecTitle) {
veRecTitle->Set(recording); veRecTitle->Set(recording);
} }
@ -180,6 +182,7 @@ void cViewReplay::SetRecording(const cRecording *recording) {
if (veScraperContent) { if (veScraperContent) {
veScraperContent->Set(recording); veScraperContent->Set(recording);
} }
SetTimeShiftValues();
} }
void cViewReplay::GetGlobalTimers(void) { void cViewReplay::GetGlobalTimers(void) {
@ -189,7 +192,7 @@ void cViewReplay::GetGlobalTimers(void) {
} }
} }
void cViewReplay::SetTimeShiftValues(const cRecording *recording) { void cViewReplay::SetTimeShiftValues(void) {
if (!recording) if (!recording)
return; return;
bool isTimeShift = false; bool isTimeShift = false;
@ -220,6 +223,7 @@ void cViewReplay::SetTimeShiftValues(const cRecording *recording) {
} }
void cViewReplay::SetTitle(const char *title) { void cViewReplay::SetTitle(const char *title) {
recording = NULL;
if (veRecTitle) { if (veRecTitle) {
veRecTitle->Set(title); veRecTitle->Set(title);
} }
@ -259,6 +263,7 @@ void cViewReplay::SetEndTime(int current, int total) {
} }
void cViewReplay::SetProgressbar(int current, int total) { void cViewReplay::SetProgressbar(int current, int total) {
SetTimeShiftValues();
if (veProgressbar) if (veProgressbar)
veProgressbar->Set(current, total, timeShiftActive, timeShiftFramesTotal); veProgressbar->Set(current, total, timeShiftActive, timeShiftFramesTotal);
Render((int)eVeDisplayReplay::progressbar); Render((int)eVeDisplayReplay::progressbar);

3
coreengine/viewdisplayreplay.h
View File

@ -21,6 +21,7 @@ private:
cVeDrJump *veJump; cVeDrJump *veJump;
cVeDrOnPause *veOnPause; cVeDrOnPause *veOnPause;
cVeDrOnPause *veOnPauseModeOnly; cVeDrOnPause *veOnPauseModeOnly;
const cRecording *recording;
bool modeOnly; bool modeOnly;
time_t lastFlush; time_t lastFlush;
time_t lastFlushModeOnly; time_t lastFlushModeOnly;
@ -33,6 +34,7 @@ private:
bool timersLoaded; bool timersLoaded;
cGlobalTimers globalTimers; cGlobalTimers globalTimers;
void GetGlobalTimers(void); void GetGlobalTimers(void);
void SetTimeShiftValues(void);
void SetViewElements(void); void SetViewElements(void);
void ClearVariables(void); void ClearVariables(void);
void SetViewElementObjects(void); void SetViewElementObjects(void);
@ -46,7 +48,6 @@ public:
void SetTimeShift(int framesTotal, int timeShiftLength); void SetTimeShift(int framesTotal, int timeShiftLength);
void SetRecording(const cRecording *recording); void SetRecording(const cRecording *recording);
void SetTitle(const char *title); void SetTitle(const char *title);
void SetTimeShiftValues(const cRecording *recording);
void SetCurrent(const char *current); void SetCurrent(const char *current);
void SetTotal(const char *total); void SetTotal(const char *total);
void SetEndTime(int current, int total); void SetEndTime(int current, int total);

4
coreengine/viewelementsdisplayreplay.c
View File

@ -273,7 +273,7 @@ void cVeDrProgressBar::SetTokenContainer(void) {
} }
void cVeDrProgressBar::Set(int current, int total, bool timeshiftActive, int timeshiftTotal) { void cVeDrProgressBar::Set(int current, int total, bool timeshiftActive, int timeshiftTotal) {
if (this->current == current) if (!(this->current != current || this->total != total))
return; return;
this->current = current; this->current = current;
this->total = total; this->total = total;
@ -595,7 +595,7 @@ void cVeDrProgressModeonly::SetTokenContainer(void) {
} }
void cVeDrProgressModeonly::Set(double fps, int current, int total) { void cVeDrProgressModeonly::Set(double fps, int current, int total) {
if (this->current == current) if (!(this->current != current || this->total != total))
return; return;
this->fps = fps; this->fps = fps;
this->current = current; this->current = current;

2
displayreplay.c
View File

@ -18,7 +18,6 @@ void cSDDisplayReplay::SetRecording(const cRecording *Recording) {
view->SetRecording(Recording); view->SetRecording(Recording);
if (init) { if (init) {
view->SetRecordingLength(Recording->LengthInSeconds()); view->SetRecordingLength(Recording->LengthInSeconds());
view->SetTimeShiftValues(Recording);
init = false; init = false;
} }
} }
@ -30,7 +29,6 @@ void cSDDisplayReplay::SetTitle(const char *Title) {
view->SetTitle(Title); view->SetTitle(Title);
if (init) { if (init) {
view->SetRecordingLength(0); view->SetRecordingLength(0);
view->SetTimeShiftValues(NULL);
init = false; init = false;
} }
} }