mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-29 08:21:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

update cryptsystems

Browse Source 
Origin commit data
------------------
Commit: 78a7c344c2
Author: TangoCash <eric@loxat.de>
Date: 2017-12-11 (Mon, 11 Dec 2017)
This commit is contained in:
TangoCash
2017-12-11 21:00:17 +01:00
committed by vanhofen
parent 90ceaf4dea
commit 09fe95ebec
3 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/gui/infoviewer_bb.cpp
View File

@@ -734,10 +734,10 @@ void CInfoViewerBB::paint_ca_icons(int caid, const char *icon, int &icon_space_o
int py = g_InfoViewer->BoxEndY + OFFSET_INNER_SMALL; int py = g_InfoViewer->BoxEndY + OFFSET_INNER_SMALL;
int px = 0; int px = 0;
static std::map<int, std::pair<int,const char*> > icon_map; static std::map<int, std::pair<int,const char*> > icon_map;
const int icon_space = OFFSET_INNER_SMALL, icon_number = 11; //NI const int icon_space = OFFSET_INNER_SMALL, icon_number = 12;
static int icon_offset[icon_number] = {0,0,0,0,0,0,0,0,0,0,0}; //NI static int icon_offset[icon_number] = {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}; //NI static int icon_sizeW [icon_number] = {0,0,0,0,0,0,0,0,0,0,0,0};
static bool init_flag = false; static bool init_flag = false;
if (!init_flag) { if (!init_flag) {
@@ -755,7 +755,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[0x1800] = std::make_pair(index++,"nagra");
icon_map[0x0B00] = std::make_pair(index++,"conax"); icon_map[0x0B00] = std::make_pair(index++,"conax");
icon_map[0x0D00] = std::make_pair(index++,"cw"); 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) { for (it=icon_map.begin(); it!=icon_map.end(); ++it) {
snprintf(buf, sizeof(buf), "%s_%s", (*it).second.second, (*it).second.first==0 ? "na" : "white"); //NI snprintf(buf, sizeof(buf), "%s_%s", (*it).second.second, (*it).second.first==0 ? "na" : "white"); //NI
@@ -808,7 +809,7 @@ void CInfoViewerBB::showIcon_CA_Status(int notfirst)
return; return;
} }
int caids[] = { 0x900, 0xD00, 0xB00, 0x1800, 0x0500, 0x0100, 0x600, 0x2600, 0x4a00, 0x0E00, 0x0000 }; //NI int caids[] = { 0x1000, 0x900, 0xD00, 0xB00, 0x1800, 0x0500, 0x0100, 0x600, 0x2600, 0x4a00, 0x0E00, 0x0000 };
const char *green = "green"; //NI const char *green = "green"; //NI
const char *white = "white"; const char *white = "white";
const char *yellow = "yellow"; const char *yellow = "yellow";

7
src/gui/streaminfo1.cpp
View File

@@ -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) void CStreamInfo2::paintCASystem(int xpos, int ypos)
{ {
unsigned short i; unsigned short i;
@@ -884,7 +884,7 @@ void CStreamInfo2::paintCASystem(int xpos, int ypos)
if (box_h2 > ypos+(iheight*2)) if (box_h2 > ypos+(iheight*2))
frameBuffer->paintBox(0, ypos+(iheight*2), box_width, box_h2, COL_MENUCONTENT_PLUS_0); 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]; bool caids[NUM_CAIDS];
int array[NUM_CAIDS]; int array[NUM_CAIDS];
char tmp[100]; char tmp[100];
@@ -936,6 +936,9 @@ void CStreamInfo2::paintCASystem(int xpos, int ypos)
case 0x0E: case 0x0E:
idx = 10; idx = 10;
break; break;
case 0x10:
idx = 11;
break;
default: default:
break; break;
} }

7
src/gui/streaminfo2.cpp
View File

@@ -1191,7 +1191,7 @@ void CStreamInfo2::paint_techinfo(int xpos, int ypos)
paintCASystem(xpos, ypos); paintCASystem(xpos, ypos);
} }
#define NUM_CAIDS 11 #define NUM_CAIDS 12
void CStreamInfo2::paintCASystem(int xpos, int ypos) void CStreamInfo2::paintCASystem(int xpos, int ypos)
{ {
int ypos1 = ypos; int ypos1 = ypos;
@@ -1199,7 +1199,7 @@ void CStreamInfo2::paintCASystem(int xpos, int ypos)
if (box_h2 > 0) if (box_h2 > 0)
frameBuffer->paintBoxRel (0, ypos, box_width, box_h2, COL_MENUCONTENT_PLUS_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]; bool caids[NUM_CAIDS];
int array[NUM_CAIDS]; int array[NUM_CAIDS];
char tmp[100]; char tmp[100];
@@ -1269,6 +1269,9 @@ void CStreamInfo2::paintCASystem(int xpos, int ypos)
case 0x0E: case 0x0E:
idx = 10; idx = 10;
break; break;
case 0x10:
idx = 11;
break;
default: default:
break; break;
} }