From 4cb8e7c67b9268a1e86481b2fb48e234580e7127 Mon Sep 17 00:00:00 2001 From: FlatTV Date: Sat, 4 Jun 2016 10:48:19 +0200 Subject: [PATCH] Revert "- infoviewer_bb: fix display of info window_" This reverts commit 1414d9889384698b260787a97159879728057eef. Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/bd089efd7d1c1f43b23827c4dc2cec75873bc6ad Author: FlatTV Date: 2016-06-04 (Sat, 04 Jun 2016) ------------------ This commit was generated by Migit --- src/gui/infoviewer_bb.cpp | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/src/gui/infoviewer_bb.cpp b/src/gui/infoviewer_bb.cpp index 7d1dc15fa..071152147 100644 --- a/src/gui/infoviewer_bb.cpp +++ b/src/gui/infoviewer_bb.cpp @@ -814,14 +814,6 @@ void CInfoViewerBB::paint_ca_icons(int caid, const char *icon, int &icon_space_o 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) return; if(NeutrinoMessages::mode_ts == CNeutrinoApp::getInstance()->getMode() && !CMoviePlayerGui::getInstance().timeshift){ @@ -873,9 +865,15 @@ void CInfoViewerBB::showIcon_CA_Status(int notfirst) icon_space_offset = 0; } #endif - //NI - if (!got_ecmInfo && camCI) - decode = CARD; + //NI - check ecm.info + int acaid = 0; + if (File_copy("/tmp/ecm.info", "/tmp/ecm.info.tmp")) { + 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 if((acaid & 0xFF00)== 0x1700 && (caids[3]& 0xFF00) == 0x1800) @@ -1141,7 +1139,7 @@ int CInfoViewerBB::parse_ecmInfo(const char * file) } } fclose(fh); - remove(file); + remove("/tmp/ecm.info.tmp"); if(buffer) free(buffer); }