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

infoviewer_bb: fix display of info window_

Browse Source 
Origin commit data
------------------
Commit: a799de3a15
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-05-26 (Thu, 26 May 2016)

Origin message was:
------------------
- infoviewer_bb: fix display of info window_
This commit is contained in:
vanhofen
2016-05-26 21:56:18 +02:00
parent 2a60c105f2
commit 8e536ab94e
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/gui/infoviewer_bb.cpp
View File

@@ -814,6 +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)
{ {
//NI - check ecm.info
int acaid = 0;
bool got_ecmInfo = File_copy("/tmp/ecm.info", "/tmp/ecm.info.tmp");
if (got_ecmInfo) {
g_InfoViewer->md5_ecmInfo = filehash((char *)"/tmp/ecm.info.tmp");
acaid = parse_ecmInfo("/tmp/ecm.info.tmp");
}
if (g_settings.infobar_casystem_display == 3) 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){
@@ -865,15 +873,9 @@ void CInfoViewerBB::showIcon_CA_Status(int notfirst)
icon_space_offset = 0; icon_space_offset = 0;
} }
#endif #endif
//NI - check ecm.info //NI
int acaid = 0; if (!got_ecmInfo && camCI)
if (File_copy("/tmp/ecm.info", "/tmp/ecm.info.tmp")) { decode = CARD;
g_InfoViewer->md5_ecmInfo = filehash((char *)"/tmp/ecm.info.tmp");
acaid = parse_ecmInfo("/tmp/ecm.info.tmp");
}
else
if(camCI)
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)
@@ -1139,7 +1141,7 @@ int CInfoViewerBB::parse_ecmInfo(const char * file)
} }
} }
fclose(fh); fclose(fh);
remove("/tmp/ecm.info.tmp"); remove(file);
if(buffer) if(buffer)
free(buffer); free(buffer);
} }