From 72f445fc5712c44166cd9b182403452d67af622a Mon Sep 17 00:00:00 2001
From: louis <louis.braun@gmx.de>
Date: Wed, 29 Apr 2015 18:22:17 +0200
Subject: [PATCH] added cardsystem name to ecm info

---
 HISTORY                                     | 2 ++
 services/dvbapi.h                           | 1 +
 skins/blackhole/xmlfiles/displaychannel.xml | 3 ++-
 skinskeleton/xmlfiles/displaychannel.xml    | 1 +
 views/viewhelpers.c                         | 1 +
 5 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/HISTORY b/HISTORY
index 5ed1575..ac5def4 100644
--- a/HISTORY
+++ b/HISTORY
@@ -302,4 +302,6 @@ Version 0.4.3
 - added tokens for progressbars in displamenudefault
 - implemented dvbapi service interface, added viewelement ecminfo
   in displaychannel
+- added cardsystem name to ecm info
+
 
diff --git a/services/dvbapi.h b/services/dvbapi.h
index 540a49c..a78aba4 100644
--- a/services/dvbapi.h
+++ b/services/dvbapi.h
@@ -9,6 +9,7 @@ struct sDVBAPIEcmInfo {
   uint16_t pid;
   uint32_t prid;
   uint32_t ecmtime;
+  cString cardsystem;
   cString reader;
   cString from;
   cString protocol;
diff --git a/skins/blackhole/xmlfiles/displaychannel.xml b/skins/blackhole/xmlfiles/displaychannel.xml
index ff8282e..9ee79e6 100644
--- a/skins/blackhole/xmlfiles/displaychannel.xml
+++ b/skins/blackhole/xmlfiles/displaychannel.xml
@@ -135,6 +135,7 @@
 
     <!-- Available Variables ecminfo:
     {caid}                              id of currently used CA
+    {cardsystem}                        name of currently used CA
     {pid}                               pID
     {prid}                              provider ID
     {ecmtime}                           ecm time in ms
@@ -146,7 +147,7 @@
 
     <ecminfo>
         <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" />
         </area>
     </ecminfo>
diff --git a/skinskeleton/xmlfiles/displaychannel.xml b/skinskeleton/xmlfiles/displaychannel.xml
index 351709c..aecf946 100644
--- a/skinskeleton/xmlfiles/displaychannel.xml
+++ b/skinskeleton/xmlfiles/displaychannel.xml
@@ -73,6 +73,7 @@
 
     <!-- Available Variables ecminfo:
     {caid}                              id of currently used CA
+    {cardsystem}                        name of currently used CA
     {pid}                               pID
     {prid}                              provider ID
     {ecmtime}                           ecm time in ms
diff --git a/views/viewhelpers.c b/views/viewhelpers.c
index 50f197b..2be6d8f 100644
--- a/views/viewhelpers.c
+++ b/views/viewhelpers.c
@@ -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>("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>("from", *ecmInfo.from ? *ecmInfo.from : ""));
     stringTokens.insert(pair<string,string>("protocol", *ecmInfo.protocol ? *ecmInfo.protocol : ""));