diff --git a/HISTORY b/HISTORY index f95803b..2072e97 100644 --- a/HISTORY +++ b/HISTORY @@ -198,3 +198,6 @@ Version 0.2.1 changes of setup parameters are immediately in use Version 0.2.2 + +- added replay onpause view in blackhole skin +- implemented SetTitle() in displayreplay diff --git a/displayreplay.c b/displayreplay.c index d89c5e5..88d6802 100644 --- a/displayreplay.c +++ b/displayreplay.c @@ -24,13 +24,19 @@ cSDDisplayReplay::~cSDDisplayReplay() { } void cSDDisplayReplay::SetRecording(const cRecording *Recording) { - if (!doOutput) + if (!doOutput || !Recording) return; replayView->DrawTitle(Recording); replayView->DrawRecordingInformation(Recording); replayView->DrawScraperContent(Recording); } +void cSDDisplayReplay::SetTitle(const char *Title) { + if (!doOutput || !Title) + return; + replayView->DrawTitle(Title); +} + void cSDDisplayReplay::SetMode(bool Play, bool Forward, int Speed) { if (!doOutput) return; diff --git a/displayreplay.h b/displayreplay.h index e299e91..836febb 100644 --- a/displayreplay.h +++ b/displayreplay.h @@ -17,7 +17,7 @@ public: cSDDisplayReplay(cTemplate *replayTemplate, bool ModeOnly); virtual ~cSDDisplayReplay(); virtual void SetRecording(const cRecording *Recording); - virtual void SetTitle(const char *Title) {}; + virtual void SetTitle(const char *Title); virtual void SetMode(bool Play, bool Forward, int Speed); virtual void SetProgress(int Current, int Total); virtual void SetCurrent(const char *Current); diff --git a/skins/blackhole/xmlfiles/displayreplay.xml b/skins/blackhole/xmlfiles/displayreplay.xml index 40daef8..4ea2577 100644 --- a/skins/blackhole/xmlfiles/displayreplay.xml +++ b/skins/blackhole/xmlfiles/displayreplay.xml @@ -1,28 +1,28 @@ - + - + - + - + - + - + @@ -39,10 +39,10 @@ {year} year in yyyy --> - + - + @@ -54,13 +54,13 @@ {hmins} current "hourminutes" to display an hour hand --> @@ -82,10 +82,10 @@ {isbanner} true if image is a banner, false if it is a poster --> - + - + @@ -97,7 +97,7 @@ {rectime} Time of Recording in hh:mm --> - + @@ -111,7 +111,7 @@ {isWideScreen} true if aspect is 16:9 or 21:9 --> - + @@ -121,7 +121,7 @@ {reccurrent} Current Time in hh:mm:ss --> - + @@ -130,7 +130,7 @@ {rectotal} Total Time in hh:mm:ss --> - + @@ -140,7 +140,7 @@ {total} total frames of recording --> - + @@ -154,7 +154,7 @@ {marks[startmark]} true if mark is start mark --> - + @@ -178,7 +178,7 @@ {rewind3x} true if rewinding 3x (with 3 trickspeeds) --> - + @@ -200,7 +200,7 @@ - + @@ -225,7 +225,7 @@ {jump} time to jump to in hh:mm --> - + @@ -237,13 +237,13 @@ {error} true if message is a error message --> - + - + @@ -358,10 +358,22 @@ --> - + + + + + + + - + + + + + + + diff --git a/views/displayreplayview.c b/views/displayreplayview.c index 48ebd75..dbd4cd3 100644 --- a/views/displayreplayview.c +++ b/views/displayreplayview.c @@ -96,6 +96,19 @@ void cDisplayReplayView::DrawTitle(const cRecording *recording) { DrawViewElement(veRecTitle, &stringTokens, &intTokens); } +void cDisplayReplayView::DrawTitle(const char *title) { + map < string, string > stringTokens; + map < string, int > intTokens; + + stringTokens.insert(pair("rectitle", title)); + stringTokens.insert(pair("recsubtitle", "")); + stringTokens.insert(pair("recdate", "")); + stringTokens.insert(pair("rectime", "")); + + DrawViewElement(veRecTitle, &stringTokens, &intTokens); +} + + void cDisplayReplayView::DrawRecordingInformation(const cRecording *recording) { map < string, string > stringTokens; map < string, int > intTokens; diff --git a/views/displayreplayview.h b/views/displayreplayview.h index 6104e2a..d5342c1 100644 --- a/views/displayreplayview.h +++ b/views/displayreplayview.h @@ -22,6 +22,7 @@ public: void DrawDate(void); void DrawTime(void); void DrawTitle(const cRecording *recording); + void DrawTitle(const char *title); void DrawRecordingInformation(const cRecording *recording); void DrawScraperContent(const cRecording *recording); void DrawCurrent(const char *current);