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

added cardsystem name to ecm info

Browse Source
This commit is contained in:
louis 2015-04-29 18:22:17 +02:00
parent e7d8a193a7
commit 72f445fc57
5 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
HISTORY
View File

@ -302,4 +302,6 @@ Version 0.4.3
- added tokens for progressbars in displamenudefault - added tokens for progressbars in displamenudefault
- implemented dvbapi service interface, added viewelement ecminfo - implemented dvbapi service interface, added viewelement ecminfo
in displaychannel in displaychannel
- added cardsystem name to ecm info

1
services/dvbapi.h
View File

@ -9,6 +9,7 @@ struct sDVBAPIEcmInfo {
uint16_t pid; uint16_t pid;
uint32_t prid; uint32_t prid;
uint32_t ecmtime; uint32_t ecmtime;
cString cardsystem;
cString reader; cString reader;
cString from; cString from;
cString protocol; cString protocol;

3
skins/blackhole/xmlfiles/displaychannel.xml
View File

@ -135,6 +135,7 @@
<!-- Available Variables ecminfo: <!-- Available Variables ecminfo:
{caid} id of currently used CA {caid} id of currently used CA
{cardsystem} name of currently used CA
{pid} pID {pid} pID
{prid} provider ID {prid} provider ID
{ecmtime} ecm time in ms {ecmtime} ecm time in ms
@ -146,7 +147,7 @@
<ecminfo> <ecminfo>
<area x="60%" y="95%" width="24%" height="5%" layer="4"> <area x="60%" y="95%" width="24%" height="5%" layer="4">
<drawtext x="0" y="5%" font="{semibold}" fontsize="40%" color="{clrWhite}" text="CAID: {caid} Reader: {reader}" /> <drawtext x="0" y="5%" font="{semibold}" fontsize="40%" color="{clrWhite}" text="{cardsystem} Reader: {reader}" />
<drawtext x="0" y="50%" font="{semibold}" fontsize="40%" color="{clrWhite}" text="ECM Time: {ecmtime} ms" /> <drawtext x="0" y="50%" font="{semibold}" fontsize="40%" color="{clrWhite}" text="ECM Time: {ecmtime} ms" />
</area> </area>
</ecminfo> </ecminfo>

1
skinskeleton/xmlfiles/displaychannel.xml
View File

@ -73,6 +73,7 @@
<!-- Available Variables ecminfo: <!-- Available Variables ecminfo:
{caid} id of currently used CA {caid} id of currently used CA
{cardsystem} name of currently used CA
{pid} pID {pid} pID
{prid} provider ID {prid} provider ID
{ecmtime} ecm time in ms {ecmtime} ecm time in ms

1
views/viewhelpers.c
View File

@ -884,6 +884,7 @@ bool cViewHelpers::SetEcmInfos(int channelSid, map < string, string > &stringTok
intTokens.insert(pair<string,int>("ecmtime", ecmInfo.ecmtime)); intTokens.insert(pair<string,int>("ecmtime", ecmInfo.ecmtime));
intTokens.insert(pair<string,int>("hops", ecmInfo.hops)); intTokens.insert(pair<string,int>("hops", ecmInfo.hops));
stringTokens.insert(pair<string,string>("cardsystem", *ecmInfo.cardsystem ? *ecmInfo.cardsystem : ""));
stringTokens.insert(pair<string,string>("reader", *ecmInfo.reader ? *ecmInfo.reader : "")); stringTokens.insert(pair<string,string>("reader", *ecmInfo.reader ? *ecmInfo.reader : ""));
stringTokens.insert(pair<string,string>("from", *ecmInfo.from ? *ecmInfo.from : "")); stringTokens.insert(pair<string,string>("from", *ecmInfo.from ? *ecmInfo.from : ""));
stringTokens.insert(pair<string,string>("protocol", *ecmInfo.protocol ? *ecmInfo.protocol : "")); stringTokens.insert(pair<string,string>("protocol", *ecmInfo.protocol ? *ecmInfo.protocol : ""));