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

Merge branch 'pbiering/skindesigner-add-isRadio-to-channel'

Browse Source
This commit is contained in:
kamel5 2021-01-21 11:57:02 +01:00
commit bcc24977b0
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
coreengine/definitions.h
View File

@ -967,6 +967,7 @@ enum class eLeMenuChannelsIT {
isSat, isSat,
isTerr, isTerr,
isEncrypted, isEncrypted,
isRadio,
count count
}; };
@ -1012,6 +1013,7 @@ enum class eCeMenuChannelsIT {
isSat, isSat,
isTerr, isTerr,
isEncrypted, isEncrypted,
isRadio,
presenteventduration, presenteventduration,
presenteventdurationhours, presenteventdurationhours,
presenteventelapsed, presenteventelapsed,

8
coreengine/listelements.c
View File

@ -1073,6 +1073,7 @@ void cLeMenuChannels::SetTokenContainer(void) {
tokenContainer->DefineIntToken("{isSat}", (int)eLeMenuChannelsIT::isSat); tokenContainer->DefineIntToken("{isSat}", (int)eLeMenuChannelsIT::isSat);
tokenContainer->DefineIntToken("{isTerr}", (int)eLeMenuChannelsIT::isTerr); tokenContainer->DefineIntToken("{isTerr}", (int)eLeMenuChannelsIT::isTerr);
tokenContainer->DefineIntToken("{isEncrypted}", (int)eLeMenuChannelsIT::isEncrypted); tokenContainer->DefineIntToken("{isEncrypted}", (int)eLeMenuChannelsIT::isEncrypted);
tokenContainer->DefineIntToken("{isRadio}", (int)eLeMenuChannelsIT::isRadio);
InheritTokenContainer(); InheritTokenContainer();
} }
@ -1092,6 +1093,8 @@ bool cLeMenuChannels::Parse(bool forced) {
if (!dirty) if (!dirty)
return false; return false;
bool isRadio = !channel->Vpid() && channel->Apid(0);
tokenContainer->Clear(); tokenContainer->Clear();
tokenContainer->AddIntToken((int)eLeMenuChannelsIT::nummenuitem, num); tokenContainer->AddIntToken((int)eLeMenuChannelsIT::nummenuitem, num);
tokenContainer->AddIntToken((int)eLeMenuChannelsIT::current, current); tokenContainer->AddIntToken((int)eLeMenuChannelsIT::current, current);
@ -1100,6 +1103,7 @@ bool cLeMenuChannels::Parse(bool forced) {
tokenContainer->AddIntToken((int)eLeMenuChannelsIT::transponder, channel->Transponder()); tokenContainer->AddIntToken((int)eLeMenuChannelsIT::transponder, channel->Transponder());
tokenContainer->AddIntToken((int)eLeMenuChannelsIT::frequency, channel->Frequency()); tokenContainer->AddIntToken((int)eLeMenuChannelsIT::frequency, channel->Frequency());
tokenContainer->AddIntToken((int)eLeMenuChannelsIT::isEncrypted, channel->Ca()); tokenContainer->AddIntToken((int)eLeMenuChannelsIT::isEncrypted, channel->Ca());
tokenContainer->AddIntToken((int)eLeMenuChannelsIT::isRadio, isRadio);
tokenContainer->AddStringToken((int)eLeMenuChannelsST::name, channel->Name()); tokenContainer->AddStringToken((int)eLeMenuChannelsST::name, channel->Name());
cString channelID = channel->GetChannelID().ToString(); cString channelID = channel->GetChannelID().ToString();
@ -1196,6 +1200,7 @@ void cCeMenuChannels::SetTokenContainer(void) {
tokenContainer->DefineIntToken("{isSat}", (int)eCeMenuChannelsIT::isSat); tokenContainer->DefineIntToken("{isSat}", (int)eCeMenuChannelsIT::isSat);
tokenContainer->DefineIntToken("{isTerr}", (int)eCeMenuChannelsIT::isTerr); tokenContainer->DefineIntToken("{isTerr}", (int)eCeMenuChannelsIT::isTerr);
tokenContainer->DefineIntToken("{isEncrypted}", (int)eCeMenuChannelsIT::isEncrypted); tokenContainer->DefineIntToken("{isEncrypted}", (int)eCeMenuChannelsIT::isEncrypted);
tokenContainer->DefineIntToken("{isRadio}", (int)eCeMenuChannelsIT::isRadio);
tokenContainer->DefineIntToken("{presenteventelapsed}", (int)eCeMenuChannelsIT::presenteventelapsed); tokenContainer->DefineIntToken("{presenteventelapsed}", (int)eCeMenuChannelsIT::presenteventelapsed);
tokenContainer->DefineIntToken("{presenteventduration}", (int)eCeMenuChannelsIT::presenteventduration); tokenContainer->DefineIntToken("{presenteventduration}", (int)eCeMenuChannelsIT::presenteventduration);
tokenContainer->DefineIntToken("{presenteventdurationhours}", (int)eCeMenuChannelsIT::presenteventdurationhours); tokenContainer->DefineIntToken("{presenteventdurationhours}", (int)eCeMenuChannelsIT::presenteventdurationhours);
@ -1227,6 +1232,8 @@ bool cCeMenuChannels::Parse(bool forced) {
if (!dirty) if (!dirty)
return false; return false;
bool isRadio = !channel->Vpid() && channel->Apid(0);
tokenContainer->Clear(); tokenContainer->Clear();
SetListTokens(tokenContainer); SetListTokens(tokenContainer);
@ -1235,6 +1242,7 @@ bool cCeMenuChannels::Parse(bool forced) {
tokenContainer->AddIntToken((int)eCeMenuChannelsIT::transponder, channel->Transponder()); tokenContainer->AddIntToken((int)eCeMenuChannelsIT::transponder, channel->Transponder());
tokenContainer->AddIntToken((int)eCeMenuChannelsIT::frequency, channel->Frequency()); tokenContainer->AddIntToken((int)eCeMenuChannelsIT::frequency, channel->Frequency());
tokenContainer->AddIntToken((int)eCeMenuChannelsIT::isEncrypted, channel->Ca()); tokenContainer->AddIntToken((int)eCeMenuChannelsIT::isEncrypted, channel->Ca());
tokenContainer->AddIntToken((int)eCeMenuChannelsIT::isRadio, isRadio);
tokenContainer->AddStringToken((int)eCeMenuChannelsST::name, channel->Name()); tokenContainer->AddStringToken((int)eCeMenuChannelsST::name, channel->Name());
cString channelID = channel->GetChannelID().ToString(); cString channelID = channel->GetChannelID().ToString();

2
skinskeleton/xmlfiles/displaymenuchannels.xml
View File

@ -16,6 +16,7 @@
{isSat} true if channel is a satellite channel {isSat} true if channel is a satellite channel
{isTerr} true if channel is terrestrical {isTerr} true if channel is terrestrical
{isEncrypted} true if channel is encrypted {isEncrypted} true if channel is encrypted
{isRadio} true if channel is a radio channel
{presenteventtitle} title of present event on this channel {presenteventtitle} title of present event on this channel
{presenteventstart} present event start time in hh::mm {presenteventstart} present event start time in hh::mm
{presenteventstop} present event event stop time in hh::mm {presenteventstop} present event event stop time in hh::mm
@ -44,6 +45,7 @@
{isSat} true if channel is a satellite channel {isSat} true if channel is a satellite channel
{isTerr} true if channel is terrestrical {isTerr} true if channel is terrestrical
{isEncrypted} true if channel is encrypted {isEncrypted} true if channel is encrypted
{isRadio} true if channel is a radio channel
{presenteventtitle} title of present event on this channel {presenteventtitle} title of present event on this channel
{presenteventstart} present event start time in hh::mm {presenteventstart} present event start time in hh::mm
{presenteventstop} present event stop time in hh::mm {presenteventstop} present event stop time in hh::mm