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

fix display of info window

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1655ecc079
Author: FlatTV <FlatTV@gmx.de>
Date: 2016-06-04 (Sat, 04 Jun 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
FlatTV
2016-06-04 17:34:33 +02:00
parent 4cb8e7c67b
commit 2953c2f484
2 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/gui/infoviewer_bb.cpp
View File

@@ -814,8 +814,14 @@ void CInfoViewerBB::paint_ca_icons(int caid, const char *icon, int &icon_space_o
void CInfoViewerBB::showIcon_CA_Status(int notfirst) void CInfoViewerBB::showIcon_CA_Status(int notfirst)
{ {
if (g_settings.infobar_casystem_display == 3) //NI
int acaid = 0;
if (g_settings.show_ecm)
acaid = check_ecmInfo();
if (g_settings.infobar_casystem_display == 3){
return; return;
}
if(NeutrinoMessages::mode_ts == CNeutrinoApp::getInstance()->getMode() && !CMoviePlayerGui::getInstance().timeshift){ if(NeutrinoMessages::mode_ts == CNeutrinoApp::getInstance()->getMode() && !CMoviePlayerGui::getInstance().timeshift){
if (g_settings.infobar_casystem_display == 2) { if (g_settings.infobar_casystem_display == 2) {
fta = true; fta = true;
@@ -866,14 +872,11 @@ void CInfoViewerBB::showIcon_CA_Status(int notfirst)
} }
#endif #endif
//NI - check ecm.info //NI - check ecm.info
int acaid = 0; acaid = check_ecmInfo();
if (File_copy("/tmp/ecm.info", "/tmp/ecm.info.tmp")) { if(acaid == 0){
g_InfoViewer->md5_ecmInfo = filehash((char *)"/tmp/ecm.info.tmp");
acaid = parse_ecmInfo("/tmp/ecm.info.tmp");
}
else
if(camCI) if(camCI)
decode = CARD; decode = CARD;
}
//NI - map betacrypt to nagra //NI - map betacrypt to nagra
if((acaid & 0xFF00)== 0x1700 && (caids[3]& 0xFF00) == 0x1800) if((acaid & 0xFF00)== 0x1700 && (caids[3]& 0xFF00) == 0x1800)
@@ -1078,6 +1081,16 @@ void CInfoViewerBB::paint_cam_icons()
} }
//NI ecm-Info //NI ecm-Info
int CInfoViewerBB::check_ecmInfo()
{
int caid = 0;
if (File_copy("/tmp/ecm.info", "/tmp/ecm.info.tmp")) {
g_InfoViewer->md5_ecmInfo = filehash((char *)"/tmp/ecm.info.tmp");
caid = parse_ecmInfo("/tmp/ecm.info.tmp");
}
return caid;
}
int CInfoViewerBB::parse_ecmInfo(const char * file) int CInfoViewerBB::parse_ecmInfo(const char * file)
{ {
int acaid = 0; int acaid = 0;

1
src/gui/infoviewer_bb.h
View File

@@ -92,6 +92,7 @@ class CInfoViewerBB
unsigned short int decode; unsigned short int decode;
int DecEndx; int DecEndx;
int parse_ecmInfo(const char * file); int parse_ecmInfo(const char * file);
int check_ecmInfo();
bool camCI; bool camCI;
typedef struct typedef struct