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

imageinfo_ni: simplify max_bit handling

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: d04afd80ba
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-03 (Fri, 03 Mar 2017)

Origin message was:
------------------
- imageinfo_ni: simplify max_bit handling

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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-03-03 23:59:53 +01:00
parent 88d934ed81
commit 35cd67346e
2 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/gui/imageinfo_ni.cpp
View File

@@ -138,8 +138,7 @@ void CImageInfoNI::Init(void)
} }
offset = offset + OFFSET_INNER_MID; offset = offset + OFFSET_INNER_MID;
netIfName = "eth0"; netIfName = "eth0"; //FIXME; What about the other ports?
netMaxBit = 104857600;
} }
CImageInfoNI::~CImageInfoNI() CImageInfoNI::~CImageInfoNI()
@@ -858,16 +857,10 @@ void CImageInfoNI::paint_NET_Info(int posx, int posy)
* 13107200 Byte * 13107200 Byte
* 104857600 Bit * 104857600 Bit
*/ */
#ifdef HAVE_GENERIC_HARDWARE
int max_bit = netMaxBit; /* PC */
#else
# ifdef BOXMODEL_CS_HD2
int max_bit = 104857600; /* Shiner, Kronos */
if (revision == 9)
max_bit = 1073741824; /* Apollo */
# else ifdef
int max_bit = 104857600; int max_bit = 104857600;
# endif #ifdef BOXMODEL_CS_HD2
if (revision == 9) /* Apollo */
max_bit = 1073741824;
#endif #endif
int percent = ((rbit_s+wbit_s)*100/max_bit); int percent = ((rbit_s+wbit_s)*100/max_bit);

3
src/gui/imageinfo_ni.h
View File

@@ -57,8 +57,6 @@ class CImageInfoNI : public CMenuTarget
int font_head; int font_head;
int font_info; int font_info;
int font_small; int font_small;
std::string netIfName;
int netMaxBit;
void paint(); void paint();
void paint_pic(int x, int y, int w, int h); void paint_pic(int x, int y, int w, int h);
@@ -104,6 +102,7 @@ class CImageInfoNI : public CMenuTarget
uint64_t read_old; uint64_t read_old;
uint64_t write_old; uint64_t write_old;
uint64_t net_best; uint64_t net_best;
std::string netIfName;
pthread_t InfoThread; pthread_t InfoThread;
static void* InfoProc(void *arg); static void* InfoProc(void *arg);