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 000000000..6255fad0d Binary files /dev/null and b/data/icons/status/ca/bc_green.png differ diff --git a/data/icons/status/ca/bc_white.png b/data/icons/status/ca/bc_white.png new file mode 100644 index 000000000..b22be65f7 Binary files /dev/null and b/data/icons/status/ca/bc_white.png differ diff --git a/data/icons/status/ca/bc_yellow.png b/data/icons/status/ca/bc_yellow.png new file mode 100644 index 000000000..28410793b Binary files /dev/null and b/data/icons/status/ca/bc_yellow.png differ diff --git a/data/icons/status/ca/vmx_green.png b/data/icons/status/ca/vmx_green.png new file mode 100644 index 000000000..0f4b0b88c Binary files /dev/null and b/data/icons/status/ca/vmx_green.png differ diff --git a/data/icons/status/ca/vmx_white.png b/data/icons/status/ca/vmx_white.png new file mode 100644 index 000000000..d8548b7c3 Binary files /dev/null and b/data/icons/status/ca/vmx_white.png differ diff --git a/data/icons/status/ca/vmx_yellow.png b/data/icons/status/ca/vmx_yellow.png new file mode 100644 index 000000000..210a2abf7 Binary files /dev/null and b/data/icons/status/ca/vmx_yellow.png differ diff --git a/src/gui/infoviewer_bb.cpp b/src/gui/infoviewer_bb.cpp index e76c94f7d..92a448270 100644 --- a/src/gui/infoviewer_bb.cpp +++ b/src/gui/infoviewer_bb.cpp @@ -733,10 +733,10 @@ void CInfoViewerBB::paint_ca_icon(int caid, const char *icon, int &icon_space_of int px = 0; static std::map > 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])