mirror of
https://projects.vdr-developer.org/git/vdr-plugin-skindesigner.git
synced 2023-10-19 17:58:31 +02:00
Merge branch 'pbiering/skindesigner-expose-isHD-isUHD-to-channel'
This commit is contained in:
commit
c0dad5a14f
@ -968,6 +968,8 @@ enum class eLeMenuChannelsIT {
|
||||
isTerr,
|
||||
isEncrypted,
|
||||
isRadio,
|
||||
isHD,
|
||||
isUHD,
|
||||
count
|
||||
};
|
||||
|
||||
@ -1014,6 +1016,8 @@ enum class eCeMenuChannelsIT {
|
||||
isTerr,
|
||||
isEncrypted,
|
||||
isRadio,
|
||||
isHD,
|
||||
isUHD,
|
||||
presenteventduration,
|
||||
presenteventdurationhours,
|
||||
presenteventelapsed,
|
||||
|
@ -1074,6 +1074,8 @@ void cLeMenuChannels::SetTokenContainer(void) {
|
||||
tokenContainer->DefineIntToken("{isTerr}", (int)eLeMenuChannelsIT::isTerr);
|
||||
tokenContainer->DefineIntToken("{isEncrypted}", (int)eLeMenuChannelsIT::isEncrypted);
|
||||
tokenContainer->DefineIntToken("{isRadio}", (int)eLeMenuChannelsIT::isRadio);
|
||||
tokenContainer->DefineIntToken("{isHD}", (int)eLeMenuChannelsIT::isHD);
|
||||
tokenContainer->DefineIntToken("{isUHD}", (int)eLeMenuChannelsIT::isUHD);
|
||||
InheritTokenContainer();
|
||||
}
|
||||
|
||||
@ -1095,6 +1097,18 @@ bool cLeMenuChannels::Parse(bool forced) {
|
||||
|
||||
bool isRadio = !channel->Vpid() && channel->Apid(0);
|
||||
|
||||
bool isHD = false;
|
||||
bool isUHD = false;
|
||||
switch (channel->Vtype()) {
|
||||
case 0x1b: // H.264
|
||||
isHD = true;
|
||||
break;
|
||||
case 0x24: // H.265
|
||||
isHD = true;
|
||||
isUHD = true;
|
||||
break;
|
||||
};
|
||||
|
||||
tokenContainer->Clear();
|
||||
tokenContainer->AddIntToken((int)eLeMenuChannelsIT::nummenuitem, num);
|
||||
tokenContainer->AddIntToken((int)eLeMenuChannelsIT::current, current);
|
||||
@ -1104,6 +1118,8 @@ bool cLeMenuChannels::Parse(bool forced) {
|
||||
tokenContainer->AddIntToken((int)eLeMenuChannelsIT::frequency, channel->Frequency());
|
||||
tokenContainer->AddIntToken((int)eLeMenuChannelsIT::isEncrypted, channel->Ca());
|
||||
tokenContainer->AddIntToken((int)eLeMenuChannelsIT::isRadio, isRadio);
|
||||
tokenContainer->AddIntToken((int)eLeMenuChannelsIT::isHD, isHD);
|
||||
tokenContainer->AddIntToken((int)eLeMenuChannelsIT::isUHD, isUHD);
|
||||
|
||||
tokenContainer->AddStringToken((int)eLeMenuChannelsST::name, channel->Name());
|
||||
cString channelID = channel->GetChannelID().ToString();
|
||||
@ -1201,6 +1217,8 @@ void cCeMenuChannels::SetTokenContainer(void) {
|
||||
tokenContainer->DefineIntToken("{isTerr}", (int)eCeMenuChannelsIT::isTerr);
|
||||
tokenContainer->DefineIntToken("{isEncrypted}", (int)eCeMenuChannelsIT::isEncrypted);
|
||||
tokenContainer->DefineIntToken("{isRadio}", (int)eCeMenuChannelsIT::isRadio);
|
||||
tokenContainer->DefineIntToken("{isHD}", (int)eCeMenuChannelsIT::isHD);
|
||||
tokenContainer->DefineIntToken("{isUHD}", (int)eCeMenuChannelsIT::isUHD);
|
||||
tokenContainer->DefineIntToken("{presenteventelapsed}", (int)eCeMenuChannelsIT::presenteventelapsed);
|
||||
tokenContainer->DefineIntToken("{presenteventduration}", (int)eCeMenuChannelsIT::presenteventduration);
|
||||
tokenContainer->DefineIntToken("{presenteventdurationhours}", (int)eCeMenuChannelsIT::presenteventdurationhours);
|
||||
@ -1234,6 +1252,18 @@ bool cCeMenuChannels::Parse(bool forced) {
|
||||
|
||||
bool isRadio = !channel->Vpid() && channel->Apid(0);
|
||||
|
||||
bool isHD = false;
|
||||
bool isUHD = false;
|
||||
switch (channel->Vtype()) {
|
||||
case 0x1b: // H.264
|
||||
isHD = true;
|
||||
break;
|
||||
case 0x24: // H.265
|
||||
isHD = true;
|
||||
isUHD = true;
|
||||
break;
|
||||
};
|
||||
|
||||
tokenContainer->Clear();
|
||||
|
||||
SetListTokens(tokenContainer);
|
||||
@ -1243,6 +1273,8 @@ bool cCeMenuChannels::Parse(bool forced) {
|
||||
tokenContainer->AddIntToken((int)eCeMenuChannelsIT::frequency, channel->Frequency());
|
||||
tokenContainer->AddIntToken((int)eCeMenuChannelsIT::isEncrypted, channel->Ca());
|
||||
tokenContainer->AddIntToken((int)eCeMenuChannelsIT::isRadio, isRadio);
|
||||
tokenContainer->AddIntToken((int)eCeMenuChannelsIT::isHD, isHD);
|
||||
tokenContainer->AddIntToken((int)eCeMenuChannelsIT::isUHD, isUHD);
|
||||
|
||||
tokenContainer->AddStringToken((int)eCeMenuChannelsST::name, channel->Name());
|
||||
cString channelID = channel->GetChannelID().ToString();
|
||||
|
Loading…
Reference in New Issue
Block a user