mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-01 09:51:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

crypt info verimatrix added

Browse Source 
Conflicts:
	src/gui/infoviewer_bb.cpp
This commit is contained in:
BPanther
2019-10-27 16:24:47 +01:00
committed by Thilo Graf
parent 670a6f951e
commit fd1dc556be
11 changed files with 29 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/gui/infoviewer_bb.cpp
View File

@@ -733,10 +733,10 @@ void CInfoViewerBB::paint_ca_icon(int caid, const char *icon, int &icon_space_of
int px = 0;
static std::map<int, std::pair<int,const char*> > 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;

7
src/gui/streaminfo1.cpp
View File

@@ -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;
}

7
src/gui/streaminfo2.cpp
View File

@@ -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;
}