diff options
| author | kamel5 <vdr.kamel5 (at) gmx (dot) net> | 2021-12-22 12:22:31 +0100 |
|---|---|---|
| committer | kamel5 <vdr.kamel5 (at) gmx (dot) net> | 2021-12-22 12:22:31 +0100 |
| commit | d11d09ca6e0d0e5f7b316c8779b455ec6e70325e (patch) | |
| tree | b81848cc897aca2634744c7d61689186305db5e3 /coreengine/viewelementsdisplaymenu.c | |
| parent | 5b61c364841dc4234254f478b56f64ff02a18fe2 (diff) | |
| parent | 9690f6d8a0e14a30bf9cb8951645ad2f78849814 (diff) | |
| download | vdr-plugin-skindesigner-d11d09ca6e0d0e5f7b316c8779b455ec6e70325e.tar.gz vdr-plugin-skindesigner-d11d09ca6e0d0e5f7b316c8779b455ec6e70325e.tar.bz2 | |
Merge branch 'pbiering/skindesigner-extend-detection-recording-isHD-isUHD'
Diffstat (limited to 'coreengine/viewelementsdisplaymenu.c')
| -rw-r--r-- | coreengine/viewelementsdisplaymenu.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/coreengine/viewelementsdisplaymenu.c b/coreengine/viewelementsdisplaymenu.c index 710cec6..5bef17a 100644 --- a/coreengine/viewelementsdisplaymenu.c +++ b/coreengine/viewelementsdisplaymenu.c @@ -1236,6 +1236,7 @@ bool cVeDmDetailheaderRec::Parse(bool forced) { #endif tokenContainer->AddIntToken((int)eDmDetailedHeaderRecIT::errors, errors); const cEvent *event = info->GetEvent(); + tChannelID channelID = tChannelID::InvalidID; if (event) { cString recDate = event->GetDateString(); cString recTime = event->GetTimeString(); @@ -1260,8 +1261,6 @@ bool cVeDmDetailheaderRec::Parse(bool forced) { tokenContainer->AddIntToken((int)eDmDetailedHeaderRecIT::durationevent, duration); tokenContainer->AddIntToken((int)eDmDetailedHeaderRecIT::durationeventhours, duration / 60); tokenContainer->AddStringToken((int)eDmDetailedHeaderRecST::durationeventminutes, *cString::sprintf("%.2d", duration%60)); - tokenContainer->AddIntToken((int)eDmDetailedHeaderRecIT::isHD, RecordingIsHD(event)); // detect HD from 'info' - tokenContainer->AddIntToken((int)eDmDetailedHeaderRecIT::isUHD, RecordingIsUHD(event)); // detect UHD from 'info' tokenContainer->AddIntToken((int)eDmDetailedHeaderRecIT::isRadio, RecordingIsRadio(event, info->FramesPerSecond())); // detect Radio from 'info' and FPS tokenContainer->AddIntToken((int)eDmDetailedHeaderRecIT::isRecording, recording->IsInUse() & ruTimer); tokenContainer->AddIntToken((int)eDmDetailedHeaderRecIT::isInUse, recording->IsInUse()); @@ -1271,6 +1270,7 @@ bool cVeDmDetailheaderRec::Parse(bool forced) { tokenContainer->AddStringToken((int)eDmDetailedHeaderRecST::recchannelname, info->ChannelName()); tokenContainer->AddStringToken((int)eDmDetailedHeaderRecST::recchannelid, info->ChannelID().ToString()); tokenContainer->AddIntToken((int)eDmDetailedHeaderRecIT::recchannelnumber, 0); // cannot be provided, for backward compatibility only + channelID = info->ChannelID(); } else { #if defined (APIVERSNUM) && (APIVERSNUM >= 20301) LOCK_CHANNELS_READ; @@ -1282,8 +1282,12 @@ bool cVeDmDetailheaderRec::Parse(bool forced) { tokenContainer->AddStringToken((int)eDmDetailedHeaderRecST::recchannelname, channel->Name()); tokenContainer->AddStringToken((int)eDmDetailedHeaderRecST::recchannelid, *channel->GetChannelID().ToString()); tokenContainer->AddIntToken((int)eDmDetailedHeaderRecIT::recchannelnumber, channel->Number()); + channelID = channel->GetChannelID(); } } + + tokenContainer->AddIntToken((int)eDmDetailedHeaderRecIT::isHD, RecordingIsHD(event, channelID)); // detect HD from 'info' + tokenContainer->AddIntToken((int)eDmDetailedHeaderRecIT::isUHD, RecordingIsUHD(event, channelID)); // detect UHD from 'info' } string recImage = ""; string path = recording->FileName() ? recording->FileName() : ""; |