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

Revert "- infoviewer_bb: fix display of info window_"

Browse Source 
This reverts commit 1414d98893.


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



------------------
This commit was generated by Migit
This commit is contained in:
FlatTV
2016-06-04 10:48:19 +02:00
parent 6e6d605483
commit 4cb8e7c67b
1 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/gui/infoviewer_bb.cpp
View File

@@ -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) 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){
@@ -873,8 +865,14 @@ void CInfoViewerBB::showIcon_CA_Status(int notfirst)
icon_space_offset = 0; icon_space_offset = 0;
} }
#endif #endif
//NI //NI - check ecm.info
if (!got_ecmInfo && camCI) 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; decode = CARD;
//NI - map betacrypt to nagra //NI - map betacrypt to nagra
@@ -1141,7 +1139,7 @@ int CInfoViewerBB::parse_ecmInfo(const char * file)
} }
} }
fclose(fh); fclose(fh);
remove(file); remove("/tmp/ecm.info.tmp");
if(buffer) if(buffer)
free(buffer); free(buffer);
} }