From d8115973e8dd9060a68354bcdbb094bf47a0a987 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Fri, 3 Mar 2017 23:59:53 +0100 Subject: [PATCH] imageinfo_ni: simplify max_bit handling Conflicts: src/gui/imageinfo_ni.cpp Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/a333845440411057aabc5a8c90bf663768f12ad8 Author: vanhofen Date: 2017-03-03 (Fri, 03 Mar 2017) Origin message was: ------------------ - imageinfo_ni: simplify max_bit handling Conflicts: src/gui/imageinfo_ni.cpp ------------------ This commit was generated by Migit --- src/gui/imageinfo_ni.cpp | 8 +++----- src/gui/imageinfo_ni.h | 1 + 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/gui/imageinfo_ni.cpp b/src/gui/imageinfo_ni.cpp index 018b234fe..c718f5bb8 100644 --- a/src/gui/imageinfo_ni.cpp +++ b/src/gui/imageinfo_ni.cpp @@ -849,12 +849,10 @@ void CImageInfoNI::paint_NET_Info(int posx, int posy) * 13107200 Byte * 104857600 Bit */ -#ifdef BOXMODEL_CS_HD2 - int max_bit = 104857600; /* Shiner, Kronos */ - if (revision == 9) - max_bit = 1073741824; /* Apollo */ -#else int max_bit = 104857600; +#ifdef BOXMODEL_CS_HD2 + if (revision == 9) /* Apollo */ + max_bit = 1073741824; #endif int percent = ((rbit_s+wbit_s)*100/max_bit); diff --git a/src/gui/imageinfo_ni.h b/src/gui/imageinfo_ni.h index 5a4259bc9..a758cf63f 100644 --- a/src/gui/imageinfo_ni.h +++ b/src/gui/imageinfo_ni.h @@ -102,6 +102,7 @@ class CImageInfoNI : public CMenuTarget uint64_t read_old; uint64_t write_old; uint64_t net_best; + std::string netIfName; pthread_t InfoThread; static void* InfoProc(void *arg);