diff --git a/HISTORY b/HISTORY index 91e16239..210d7d9f 100644 --- a/HISTORY +++ b/HISTORY @@ -9860,3 +9860,5 @@ Video Disk Recorder Revision History the 'info' file under the 'F' tag (thanks to Christoph Haubrich). - Added the function cRecordingInfo::FrameParams(), which can be used to get a nicely formatted string with all the available frame data. +- The recording info of the default skins now shows the frame parameters of the + recording at the end of the description (if such information is available). diff --git a/skinclassic.c b/skinclassic.c index 3b01cb96..1afb5e02 100644 --- a/skinclassic.c +++ b/skinclassic.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: skinclassic.c 5.1 2021/07/01 15:40:46 kls Exp $ + * $Id: skinclassic.c 5.2 2023/12/29 10:48:40 kls Exp $ */ #include "skinclassic.h" @@ -421,7 +421,13 @@ void cSkinClassicDisplayMenu::SetRecording(const cRecording *Recording) } y += font->Height(); if (!isempty(Info->Description())) { - textScroller.Set(osd, x1, y, x2 - x1, y3 - y, Info->Description(), font, Theme.Color(clrMenuEventDescription), Theme.Color(clrBackground)); + cString d = Info->Description(); + cString f = Info->FrameParams(); + if (*f) { + d.Append("\n\n"); + d.Append(f); + } + textScroller.Set(osd, x1, y, x2 - x1, y3 - y, d, font, Theme.Color(clrMenuEventDescription), Theme.Color(clrBackground)); SetTextScrollbar(); } } diff --git a/skinlcars.c b/skinlcars.c index 50198a2d..745f7586 100644 --- a/skinlcars.c +++ b/skinlcars.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: skinlcars.c 5.3 2021/07/01 15:40:46 kls Exp $ + * $Id: skinlcars.c 5.4 2023/12/29 10:48:40 kls Exp $ */ // "Star Trek: The Next Generation"(R) is a registered trademark of Paramount Pictures, @@ -1729,7 +1729,13 @@ void cSkinLCARSDisplayMenu::SetRecording(const cRecording *Recording) if (!isempty(Info->Description())) { int yt = y; int yb = yi01; - textScroller.Set(osd, xl, yt, xi01 - xl, yb - yt, Info->Description(), font, Theme.Color(clrEventDescription), Theme.Color(clrBackground)); + cString d = Info->Description(); + cString f = Info->FrameParams(); + if (*f) { + d.Append("\n\n"); + d.Append(f); + } + textScroller.Set(osd, xl, yt, xi01 - xl, yb - yt, d, font, Theme.Color(clrEventDescription), Theme.Color(clrBackground)); DrawTextScrollbar(); } } diff --git a/skinsttng.c b/skinsttng.c index 3603f8d3..6c8bd9f9 100644 --- a/skinsttng.c +++ b/skinsttng.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: skinsttng.c 5.1 2021/07/01 15:40:46 kls Exp $ + * $Id: skinsttng.c 5.2 2023/12/29 10:48:40 kls Exp $ */ // "Star Trek: The Next Generation"(R) is a registered trademark of Paramount Pictures @@ -745,7 +745,13 @@ void cSkinSTTNGDisplayMenu::SetRecording(const cRecording *Recording) if (!isempty(Info->Description())) { int yt = y; int yb = y4 - Roundness; - textScroller.Set(osd, xl, yt, x4 - xl, yb - yt, Info->Description(), font, Theme.Color(clrMenuEventDescription), Theme.Color(clrBackground)); + cString d = Info->Description(); + cString f = Info->FrameParams(); + if (*f) { + d.Append("\n\n"); + d.Append(f); + } + textScroller.Set(osd, xl, yt, x4 - xl, yb - yt, d, font, Theme.Color(clrMenuEventDescription), Theme.Color(clrBackground)); yb = yt + textScroller.Height(); osd->DrawEllipse (x1, yt - Roundness, x2, yt, frameColor, -3); osd->DrawRectangle(x1, yt, x2, yb, frameColor);