diff --git a/coreengine/definitions.h b/coreengine/definitions.h index cb8e8a2..7178ecf 100644 --- a/coreengine/definitions.h +++ b/coreengine/definitions.h @@ -803,6 +803,7 @@ enum class eLeMenuChannelsIT { isCable, isSat, isTerr, + isEncrypted, count }; @@ -845,6 +846,7 @@ enum class eCeMenuChannelsIT { isCable, isSat, isTerr, + isEncrypted, presenteventduration, presenteventdurationhours, presenteventelapsed, diff --git a/coreengine/listelements.c b/coreengine/listelements.c index f0b6a00..a22a752 100644 --- a/coreengine/listelements.c +++ b/coreengine/listelements.c @@ -819,6 +819,7 @@ void cLeMenuChannels::SetTokenContainer(void) { tokenContainer->DefineIntToken("{isCable}", (int)eLeMenuChannelsIT::isCable); tokenContainer->DefineIntToken("{isSat}", (int)eLeMenuChannelsIT::isSat); tokenContainer->DefineIntToken("{isTerr}", (int)eLeMenuChannelsIT::isTerr); + tokenContainer->DefineIntToken("{isEncrypted}", (int)eLeMenuChannelsIT::isEncrypted); InheritTokenContainer(); } @@ -845,6 +846,7 @@ bool cLeMenuChannels::Parse(bool forced) { tokenContainer->AddIntToken((int)eLeMenuChannelsIT::number, channel->Number()); tokenContainer->AddIntToken((int)eLeMenuChannelsIT::transponder, channel->Transponder()); tokenContainer->AddIntToken((int)eLeMenuChannelsIT::frequency, channel->Frequency()); + tokenContainer->AddIntToken((int)eLeMenuChannelsIT::isEncrypted, channel->Ca()); tokenContainer->AddStringToken((int)eLeMenuChannelsST::name, channel->Name()); cString channelID = channel->GetChannelID().ToString(); @@ -934,6 +936,7 @@ void cCeMenuChannels::SetTokenContainer(void) { tokenContainer->DefineIntToken("{isCable}", (int)eCeMenuChannelsIT::isCable); tokenContainer->DefineIntToken("{isSat}", (int)eCeMenuChannelsIT::isSat); tokenContainer->DefineIntToken("{isTerr}", (int)eCeMenuChannelsIT::isTerr); + tokenContainer->DefineIntToken("{isEncrypted}", (int)eCeMenuChannelsIT::isEncrypted); tokenContainer->DefineIntToken("{presenteventelapsed}", (int)eCeMenuChannelsIT::presenteventelapsed); tokenContainer->DefineIntToken("{presenteventduration}", (int)eCeMenuChannelsIT::presenteventduration); tokenContainer->DefineIntToken("{presenteventdurationhours}", (int)eCeMenuChannelsIT::presenteventdurationhours); @@ -969,6 +972,7 @@ bool cCeMenuChannels::Parse(bool forced) { tokenContainer->AddIntToken((int)eCeMenuChannelsIT::number, channel->Number()); tokenContainer->AddIntToken((int)eCeMenuChannelsIT::transponder, channel->Transponder()); tokenContainer->AddIntToken((int)eCeMenuChannelsIT::frequency, channel->Frequency()); + tokenContainer->AddIntToken((int)eCeMenuChannelsIT::isEncrypted, channel->Ca()); tokenContainer->AddStringToken((int)eCeMenuChannelsST::name, channel->Name()); cString channelID = channel->GetChannelID().ToString(); diff --git a/skins/metrixhd/xmlfiles/displaymenuchannels.xml b/skins/metrixhd/xmlfiles/displaymenuchannels.xml index 21999fc..44685a2 100644 --- a/skins/metrixhd/xmlfiles/displaymenuchannels.xml +++ b/skins/metrixhd/xmlfiles/displaymenuchannels.xml @@ -2,7 +2,7 @@ - + @@ -10,9 +10,13 @@ - + + + + + diff --git a/skinskeleton/xmlfiles/displaymenuchannels.xml b/skinskeleton/xmlfiles/displaymenuchannels.xml index ba6ef24..bee9079 100644 --- a/skinskeleton/xmlfiles/displaymenuchannels.xml +++ b/skinskeleton/xmlfiles/displaymenuchannels.xml @@ -15,6 +15,7 @@ {isCable} true if channel is cable channel {isSat} true if channel is a satellite channel {isTerr} true if channel is terrestrical + {isEncrypted} true if channel is encrypted {presenteventtitle} title of present event on this channel {presenteventstart} present event start time in hh::mm {presenteventstop} present event event stop time in hh::mm @@ -42,6 +43,7 @@ {isCable} true if channel is cable channel {isSat} true if channel is a satellite channel {isTerr} true if channel is terrestrical + {isEncrypted} true if channel is encrypted {presenteventtitle} title of present event on this channel {presenteventstart} present event start time in hh::mm {presenteventstop} present event stop time in hh::mm