mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 00:11:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

-fix cryptoinfo

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@348 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
satbaby
2010-02-15 21:55:11 +00:00
parent 96280ff817
commit 29ebf23541
3 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/infoviewer.cpp
View File

@@ -1770,7 +1770,6 @@ void CInfoViewer::paint_ca_icons(int caid, char * icon)
sprintf(buf, "%s_%s", "biss", icon); sprintf(buf, "%s_%s", "biss", icon);
break; break;
case 0x600: case 0x600:
case 0x602:
case 0x1700: case 0x1700:
px = endx - 48 - 38 - 6*10 - 4*14 - 10; px = endx - 48 - 38 - 6*10 - 4*14 - 10;
sprintf(buf, "%s_%s", "ird", icon); sprintf(buf, "%s_%s", "ird", icon);
@@ -1784,7 +1783,6 @@ void CInfoViewer::paint_ca_icons(int caid, char * icon)
sprintf(buf, "%s_%s", "via", icon); sprintf(buf, "%s_%s", "via", icon);
break; break;
case 0x1800: case 0x1800:
case 0x1801:
px = endx - 48 - 38 - 3*10 - 2*14; px = endx - 48 - 38 - 3*10 - 2*14;
sprintf(buf, "%s_%s", "nagra", icon); sprintf(buf, "%s_%s", "nagra", icon);
break; break;
@@ -1824,10 +1822,10 @@ void CInfoViewer::showIcon_CA_Status (int notfirst)
extern int pmt_caids[4][11]; extern int pmt_caids[4][11];
int i; int i;
int caids[] = { 0x600, 0x1700, 0x0100, 0x0500, 0x1800, 0xB00, 0xD00, 0x900, 0x2600, 0x4a00, 0x0E00 }; int caids[] = { 0x600, 0x1700, 0x0100, 0x0500, 0x1800, 0xB00, 0xD00, 0x900, 0x2600, 0x4a00, 0x0E00 };
if (!notfirst) { if (!notfirst) {
for (i=0; i < (int)(sizeof(caids)/sizeof(int)); i++) { for (i=0; i < (int)(sizeof(caids)/sizeof(int)); i++) {
paint_ca_icons(caids[i], (char *) (pmt_caids[0][i] ? white : gray)); if(!(i == 1 && pmt_caids[0][0] != 0 && pmt_caids[0][1] == 0 ))
paint_ca_icons(caids[i], (char *) (pmt_caids[0][i] ? white : gray));
} }
} }
} }

2
src/gui/streaminfo2.cpp
View File

@@ -673,7 +673,6 @@ void CStreamInfo2::paintCASystem(int xpos, int ypos)
{ {
extern int pmt_caids[4][11]; extern int pmt_caids[4][11];
unsigned short i,j; unsigned short i,j;
bool ecm_pid_ok = true;
std::string casys[11]={"Irdeto:","Betacrypt:","Seca:","Viaccess:","Nagra:","Conax: ","Cryptoworks:","Videoguard:","EBU:","XCrypt:","PowerVU:"}; std::string casys[11]={"Irdeto:","Betacrypt:","Seca:","Viaccess:","Nagra:","Conax: ","Cryptoworks:","Videoguard:","EBU:","XCrypt:","PowerVU:"};
bool caids[11] ={ false, false, false, false, false, false, false, false, false, false, false }; bool caids[11] ={ false, false, false, false, false, false, false, false, false, false, false };
char tmp[100] = {0}; char tmp[100] = {0};
@@ -828,7 +827,6 @@ void CStreamInfo2::paintCASystem(int xpos, int ypos)
} }
caids[i] = true; caids[i] = true;
} }
ecm_pid_ok = true;
} }
} }
int spaceoffset = 0 ; int spaceoffset = 0 ;

2
src/zapit/src/pmt.cpp
View File

@@ -360,7 +360,7 @@ int parse_pmt(CZapitChannel * const channel)
/* current position in buffer */ /* current position in buffer */
unsigned short i,j; unsigned short i,j;
for(j=0;j<4;j++){ for(j=0;j<4;j++){
for(i=0;i<10;i++) for(i=0;i<11;i++)
pmt_caids[j][i] = 0; pmt_caids[j][i] = 0;
} }
/* length of elementary stream description */ /* length of elementary stream description */