From fd1dc556be835a72d5a49050ee01fc32e2279fae Mon Sep 17 00:00:00 2001 From: BPanther Date: Sun, 27 Oct 2019 16:24:47 +0100 Subject: [PATCH] crypt info verimatrix added Conflicts: src/gui/infoviewer_bb.cpp --- data/icons/status/ca/Makefile.am | 6 ++++++ data/icons/status/ca/bc_green.png | Bin 0 -> 248 bytes data/icons/status/ca/bc_white.png | Bin 0 -> 245 bytes data/icons/status/ca/bc_yellow.png | Bin 0 -> 248 bytes data/icons/status/ca/vmx_green.png | Bin 0 -> 290 bytes data/icons/status/ca/vmx_white.png | Bin 0 -> 290 bytes data/icons/status/ca/vmx_yellow.png | Bin 0 -> 291 bytes src/gui/infoviewer_bb.cpp | 14 ++++++++------ src/gui/streaminfo1.cpp | 7 +++++-- src/gui/streaminfo2.cpp | 7 +++++-- src/nhttpd/tuxboxapi/neutrinoapi.cpp | 8 +++++--- 11 files changed, 29 insertions(+), 13 deletions(-) create mode 100644 data/icons/status/ca/bc_green.png create mode 100644 data/icons/status/ca/bc_white.png create mode 100644 data/icons/status/ca/bc_yellow.png create mode 100644 data/icons/status/ca/vmx_green.png create mode 100644 data/icons/status/ca/vmx_white.png create mode 100644 data/icons/status/ca/vmx_yellow.png diff --git a/data/icons/status/ca/Makefile.am b/data/icons/status/ca/Makefile.am index 8378a40b7..adf12d96a 100644 --- a/data/icons/status/ca/Makefile.am +++ b/data/icons/status/ca/Makefile.am @@ -1,6 +1,9 @@ installdir = $(ICONSDIR) install_DATA = \ + bc_green.png \ + bc_white.png \ + bc_yellow.png \ biss_green.png \ biss_white.png \ biss_yellow.png \ @@ -34,6 +37,9 @@ install_DATA = \ via_green.png \ via_white.png \ via_yellow.png \ + vmx_green.png \ + vmx_white.png \ + vmx_yellow.png \ x_green.png \ x_white.png \ x_yellow.png diff --git a/data/icons/status/ca/bc_green.png b/data/icons/status/ca/bc_green.png new file mode 100644 index 0000000000000000000000000000000000000000..6255fad0d5eaaa40da1e2b7dbf3e4bb0e70e34f8 GIT binary patch literal 248 zcmeAS@N?(olHy`uVBq!ia0vp^GC(ZC!VDyH3LH)WDfIxK5Lch|0YK!v(%;F+$u-3d z$Sy7}E-fu>Z*RYJ>C)xPm#rT{RvO1i@ jH^+OA_=P?FQWgv+%0jL)`e)PuO=a+O^>bP0l+XkK#&S@} literal 0 HcmV?d00001 diff --git a/data/icons/status/ca/bc_white.png b/data/icons/status/ca/bc_white.png new file mode 100644 index 0000000000000000000000000000000000000000..b22be65f72c7f26c82c03f35a13b74af8a01b9db GIT binary patch literal 245 zcmeAS@N?(olHy`uVBq!ia0vp^GC(ZC!VDyH3LH)WDU|@95Z6*LC@Ly)a&ig^3Mwux z1`4#dw_mz+>GI{v*REZA@ZdpbvHyOcdd89}%WB5^r6!ONM6i%092$AL~o z$(h-1GqU$qyKi{-=I-o=ckZ5@wp;MdS%r>(o@00S?v~)6KH**(w@P=zIfJ)t#hu@o eW_=H2W@lLB8`5VwutlvaRGh^x=~03h;S>F?y^l*!&%@FS~c3@%CwlioM@99i6-R z?1@!*Yxm~dsXi5V))1TI9FC{EazA?0{%ktF{l)|u^3I3`FYXbbqMp1&Q@ dBw)ON(SCjDoW+Npl>seh@O1TaS?83{1OS0rYZU+h literal 0 HcmV?d00001 diff --git a/data/icons/status/ca/vmx_white.png b/data/icons/status/ca/vmx_white.png new file mode 100644 index 0000000000000000000000000000000000000000..d8548b7c35c97455a2d293e38d7e4e068623c78a GIT binary patch literal 290 zcmeAS@N?(olHy`uVBq!ia0vp^DnKm4!VDzELz>utlvaRGh-)br6crUYIXMLd1pyhw z#l=9eb?eq$ym;}_rAv43-o1bS{(}b(L`+V92I^ug3GxeOaCmkj4a7xKko&BLWQ0#jv*44lM}SunYnnh zj%6I^TqqHHVortP?89d5xs%W8-Im+7vqxvkjaQq__TD=jpm_VVLxt}5O-JW$K6_$S z-rBu6cd8FdL|(nSdwL_!4uK01CW;d_W=J_6TO`RpiFIcC6OIXz3EBdFs^@PutlvaRGi0khIxn>ircIh+L^k;M!Q+`=Ht$S`Y;1W=H@#M9T6{V|t-h?#!9zqS!jsL0dBF+}2Wa>A}| zHW7&{Jr^B>4yTqVMn7s@V;-Hqjnm9FXY88 c&NQ$w@Y;3FxHwfc8)!R&r>mdKI;Vst00W > icon_map; - const int icon_space = OFFSET_INNER_SMALL, icon_number = 11; + const int icon_space = OFFSET_INNER_SMALL, icon_number = 13; - 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 int icon_offset[icon_number] = {0,0,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,0,0}; static bool init_flag = false; @@ -750,12 +750,14 @@ void CInfoViewerBB::paint_ca_icon(int caid, const char *icon, int &icon_space_of icon_map[0x2600] = std::make_pair(index++,"biss"); icon_map[0x4A00] = std::make_pair(index++,"d"); icon_map[0x0600] = std::make_pair(index++,"ird"); + icon_map[0x1700] = std::make_pair(index++,"bc"); icon_map[0x0100] = std::make_pair(index++,"seca"); icon_map[0x0500] = std::make_pair(index++,"via"); 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[0x5600] = std::make_pair(index ,"vmx"); for (it=icon_map.begin(); it!=icon_map.end(); ++it) { snprintf(buf, sizeof(buf), "%s_%s", (*it).second.second, icon); @@ -804,8 +806,8 @@ void CInfoViewerBB::paint_ca_icons(int notfirst) return; } - int caids[] = { 0x900, 0xD00, 0xB00, 0x1800, 0x0500, 0x0100, 0x600, 0x4a00, 0x2600, 0x1000, 0x0E00 }; -// const char *green = "green"; // unused + int caids[] = { 0x5600, 0x900, 0xD00, 0xB00, 0x1800, 0x0500, 0x0100, 0x1700, 0x600, 0x4a00, 0x2600, 0x1000, 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 b004a9942..67b642884 100644 --- a/src/gui/streaminfo1.cpp +++ b/src/gui/streaminfo1.cpp @@ -890,7 +890,7 @@ void CStreamInfo2::paint_techinfo(int xpos, int ypos) } } -#define NUM_CAIDS 12 +#define NUM_CAIDS 13 void CStreamInfo2::paintCASystem(int xpos, int ypos) { unsigned short i; @@ -898,7 +898,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:","Biss:","DreCrypt:","PowerVU:","Tandberg:"}; + std::string casys[NUM_CAIDS]={"Irdeto:","Betacrypt:","Seca:","Viaccess:","Nagra:","Conax:","Cryptoworks:","Videoguard:","Biss:","DreCrypt:","PowerVU:","Tandberg:","Verimatrix:"}; bool caids[NUM_CAIDS]; int array[NUM_CAIDS]; char tmp[100]; @@ -953,6 +953,9 @@ void CStreamInfo2::paintCASystem(int xpos, int ypos) case 0x10: idx = 11; break; + case 0x56: + idx = 12; + break; default: break; } diff --git a/src/gui/streaminfo2.cpp b/src/gui/streaminfo2.cpp index 38a813615..352ef8f33 100644 --- a/src/gui/streaminfo2.cpp +++ b/src/gui/streaminfo2.cpp @@ -1222,7 +1222,7 @@ void CStreamInfo2::paint_techinfo(int xpos, int ypos) paintCASystem(xpos, ypos); } -#define NUM_CAIDS 12 +#define NUM_CAIDS 13 void CStreamInfo2::paintCASystem(int xpos, int ypos) { int ypos1 = ypos; @@ -1230,7 +1230,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:", "Biss:", "DreCrypt:", "PowerVU:", "Tandberg:"}; + std::string casys[NUM_CAIDS] = {"Irdeto:", "Betacrypt:", "Seca:", "Viaccess:", "Nagra:", "Conax: ", "Cryptoworks:", "Videoguard:", "Biss:", "DreCrypt:", "PowerVU:", "Tandberg:","Verimatrix:"}; bool caids[NUM_CAIDS]; char tmp[100]; @@ -1299,6 +1299,9 @@ void CStreamInfo2::paintCASystem(int xpos, int ypos) case 0x10: idx = 11; break; + case 0x56: + idx = 12; + break; default: break; } diff --git a/src/nhttpd/tuxboxapi/neutrinoapi.cpp b/src/nhttpd/tuxboxapi/neutrinoapi.cpp index ee7a39aba..66406cd24 100644 --- a/src/nhttpd/tuxboxapi/neutrinoapi.cpp +++ b/src/nhttpd/tuxboxapi/neutrinoapi.cpp @@ -508,16 +508,18 @@ std::string CNeutrinoAPI::getAudioInfoAsString(void) } //------------------------------------------------------------------------- + +#define NUM_CAIDS 13 std::string CNeutrinoAPI::getCryptInfoAsString(void) { std::stringstream out; - std::string casys[12]= {"Irdeto:","Betacrypt:","Seca:","Viaccess:","Nagra:","Conax: ","Cryptoworks:","Videoguard:","Biss:","DreCrypt:","PowerVU:","Tandberg:"}; - int caids[] = { 0x600, 0x1700, 0x0100, 0x0500, 0x1800, 0xB00, 0xD00, 0x900, 0x2600, 0x4a00, 0x0E00, 0x1000 }; + std::string casys[NUM_CAIDS]= {"Irdeto:","Betacrypt:","Seca:","Viaccess:","Nagra:","Conax:","Cryptoworks:","Videoguard:","Biss:","DreCrypt:","PowerVU:","Tandberg:","Verimatrix:"}; + int caids[] = { 0x600, 0x1700, 0x0100, 0x0500, 0x1800, 0xB00, 0xD00, 0x900, 0x2600, 0x4a00, 0x0E00, 0x1000, 0x5600 }; OpenThreads::ScopedPointerLock lock(pmutex); CZapitChannel * channel = CZapit::getInstance()->GetCurrentChannel(); if(channel) { - for (unsigned short i = 0; i < 12; i++) { + for (unsigned short i = 0; i < NUM_CAIDS; i++) { for(casys_map_iterator_t it = channel->camap.begin(); it != channel->camap.end(); ++it) { int caid = (*it) & 0xFF00; if(caid == caids[i])