From ac696e9ba32c16cf3dc8c33dc0f18046617ef9f3 Mon Sep 17 00:00:00 2001 From: TangoCash Date: Mon, 11 Dec 2017 21:00:17 +0100 Subject: [PATCH] update cryptsystems --- src/gui/infoviewer_bb.cpp | 15 ++++++++++----- src/gui/streaminfo1.cpp | 7 +++++-- src/gui/streaminfo2.cpp | 7 +++++-- 3 files changed, 20 insertions(+), 9 deletions(-) diff --git a/src/gui/infoviewer_bb.cpp b/src/gui/infoviewer_bb.cpp index cc52f1f95..6e615f191 100644 --- a/src/gui/infoviewer_bb.cpp +++ b/src/gui/infoviewer_bb.cpp @@ -717,10 +717,12 @@ void CInfoViewerBB::paint_ca_icons(int caid, const char *icon, int &icon_space_o int py = g_InfoViewer->BoxEndY + OFFSET_INNER_SMALL; int px = 0; static std::map > icon_map; - const int icon_space = OFFSET_INNER_SMALL, icon_number = 10; - static int icon_offset[icon_number] = {0,0,0,0,0,0,0,0,0,0}; - static int icon_sizeW [icon_number] = {0,0,0,0,0,0,0,0,0,0}; + const int icon_space = OFFSET_INNER_SMALL, icon_number = 11; + + static int icon_offset[icon_number] = {0,0,0,0,0,0,0,0,0,0,0}; + static int icon_sizeW [icon_number] = {0,0,0,0,0,0,0,0,0,0,0}; + static bool init_flag = false; if (!init_flag) { @@ -737,7 +739,8 @@ void CInfoViewerBB::paint_ca_icons(int caid, const char *icon, int &icon_space_o icon_map[0x1800] = std::make_pair(index++,"nagra"); icon_map[0x0B00] = std::make_pair(index++,"conax"); icon_map[0x0D00] = std::make_pair(index++,"cw"); - icon_map[0x0900] = std::make_pair(index ,"nds"); + icon_map[0x0900] = std::make_pair(index++,"nds"); + icon_map[0x1000] = std::make_pair(index ,"tan"); for (it=icon_map.begin(); it!=icon_map.end(); ++it) { snprintf(buf, sizeof(buf), "%s_%s", (*it).second.second, icon); @@ -785,7 +788,9 @@ void CInfoViewerBB::showIcon_CA_Status(int notfirst) return; } - int caids[] = { 0x900, 0xD00, 0xB00, 0x1800, 0x0500, 0x0100, 0x600, 0x2600, 0x4a00, 0x0E00 }; + + int caids[] = { 0x1000, 0x900, 0xD00, 0xB00, 0x1800, 0x0500, 0x0100, 0x600, 0x2600, 0x4a00, 0x0E00}; +// const char *green = "green"; // unused const char *white = "white"; const char *yellow = "yellow"; int icon_space_offset = 0; diff --git a/src/gui/streaminfo1.cpp b/src/gui/streaminfo1.cpp index 494cbe8b9..fcb6b5445 100644 --- a/src/gui/streaminfo1.cpp +++ b/src/gui/streaminfo1.cpp @@ -876,7 +876,7 @@ void CStreamInfo2::paint_techinfo(int xpos, int ypos) } } -#define NUM_CAIDS 11 +#define NUM_CAIDS 12 void CStreamInfo2::paintCASystem(int xpos, int ypos) { unsigned short i; @@ -884,7 +884,7 @@ void CStreamInfo2::paintCASystem(int xpos, int ypos) if (box_h2 > ypos+(iheight*2)) frameBuffer->paintBox(0, ypos+(iheight*2), box_width, box_h2, COL_MENUCONTENT_PLUS_0); - std::string casys[NUM_CAIDS]={"Irdeto:","Betacrypt:","Seca:","Viaccess:","Nagra:","Conax: ","Cryptoworks:","Videoguard:","EBU:","XCrypt:","PowerVU:"}; + std::string casys[NUM_CAIDS]={"Irdeto:","Betacrypt:","Seca:","Viaccess:","Nagra:","Conax: ","Cryptoworks:","Videoguard:","Biss:","DreCrypt:","PowerVU:","Tandberg:"}; bool caids[NUM_CAIDS]; int array[NUM_CAIDS]; char tmp[100]; @@ -936,6 +936,9 @@ void CStreamInfo2::paintCASystem(int xpos, int ypos) case 0x0E: idx = 10; break; + case 0x10: + idx = 11; + break; default: break; } diff --git a/src/gui/streaminfo2.cpp b/src/gui/streaminfo2.cpp index 0e666d11a..4eaa78b09 100644 --- a/src/gui/streaminfo2.cpp +++ b/src/gui/streaminfo2.cpp @@ -1190,7 +1190,7 @@ void CStreamInfo2::paint_techinfo(int xpos, int ypos) paintCASystem(xpos, ypos); } -#define NUM_CAIDS 11 +#define NUM_CAIDS 12 void CStreamInfo2::paintCASystem(int xpos, int ypos) { int ypos1 = ypos; @@ -1198,7 +1198,7 @@ void CStreamInfo2::paintCASystem(int xpos, int ypos) if (box_h2 > 0) frameBuffer->paintBoxRel (0, ypos, box_width, box_h2, COL_MENUCONTENT_PLUS_0); - std::string casys[NUM_CAIDS]={"Irdeto:","Betacrypt:","Seca:","Viaccess:","Nagra:","Conax: ","Cryptoworks:","Videoguard:","EBU:","XCrypt:","PowerVU:"}; + std::string casys[NUM_CAIDS]={"Irdeto:","Betacrypt:","Seca:","Viaccess:","Nagra:","Conax: ","Cryptoworks:","Videoguard:","Biss:","DreCrypt:","PowerVU:","Tandberg:"}; bool caids[NUM_CAIDS]; int array[NUM_CAIDS]; char tmp[100]; @@ -1268,6 +1268,9 @@ void CStreamInfo2::paintCASystem(int xpos, int ypos) case 0x0E: idx = 10; break; + case 0x10: + idx = 11; + break; default: break; }