From ef2c78fbccbad80c1a16716c03a11d65a633a30d Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Mon, 15 Feb 2010 21:55:11 +0000 Subject: [PATCH] fix cryptoinfo git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@348 e54a6e83-5905-42d5-8d5c-058d10e6a962 Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/29ebf23541fa97adff49aef872ebdc5fb671aade Author: Jacek Jendrzej Date: 2010-02-15 (Mon, 15 Feb 2010) Origin message was: ------------------ -fix cryptoinfo git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@348 e54a6e83-5905-42d5-8d5c-058d10e6a962 ------------------ This commit was generated by Migit --- src/gui/infoviewer.cpp | 6 ++---- src/gui/streaminfo2.cpp | 2 -- src/zapit/src/pmt.cpp | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/gui/infoviewer.cpp b/src/gui/infoviewer.cpp index ea1b73b67..ee8cdfde5 100644 --- a/src/gui/infoviewer.cpp +++ b/src/gui/infoviewer.cpp @@ -1770,7 +1770,6 @@ void CInfoViewer::paint_ca_icons(int caid, char * icon) sprintf(buf, "%s_%s", "biss", icon); break; case 0x600: - case 0x602: case 0x1700: px = endx - 48 - 38 - 6*10 - 4*14 - 10; 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); break; case 0x1800: - case 0x1801: px = endx - 48 - 38 - 3*10 - 2*14; sprintf(buf, "%s_%s", "nagra", icon); break; @@ -1824,10 +1822,10 @@ void CInfoViewer::showIcon_CA_Status (int notfirst) extern int pmt_caids[4][11]; int i; int caids[] = { 0x600, 0x1700, 0x0100, 0x0500, 0x1800, 0xB00, 0xD00, 0x900, 0x2600, 0x4a00, 0x0E00 }; - if (!notfirst) { 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)); } } } diff --git a/src/gui/streaminfo2.cpp b/src/gui/streaminfo2.cpp index dc47dcfc5..944a48fc6 100644 --- a/src/gui/streaminfo2.cpp +++ b/src/gui/streaminfo2.cpp @@ -673,7 +673,6 @@ void CStreamInfo2::paintCASystem(int xpos, int ypos) { extern int pmt_caids[4][11]; unsigned short i,j; - bool ecm_pid_ok = true; 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 }; char tmp[100] = {0}; @@ -828,7 +827,6 @@ void CStreamInfo2::paintCASystem(int xpos, int ypos) } caids[i] = true; } - ecm_pid_ok = true; } } int spaceoffset = 0 ; diff --git a/src/zapit/src/pmt.cpp b/src/zapit/src/pmt.cpp index 5c0732155..1a5911e26 100644 --- a/src/zapit/src/pmt.cpp +++ b/src/zapit/src/pmt.cpp @@ -360,7 +360,7 @@ int parse_pmt(CZapitChannel * const channel) /* current position in buffer */ unsigned short i,j; for(j=0;j<4;j++){ - for(i=0;i<10;i++) + for(i=0;i<11;i++) pmt_caids[j][i] = 0; } /* length of elementary stream description */