imageinfo_ni: simplify max_bit handling

Conflicts:
	src/gui/imageinfo_ni.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: a333845440
Author: vanhofen <vanhofen@gmx.de>
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
This commit is contained in:
vanhofen
2017-03-03 23:59:53 +01:00
parent df7c99fcc7
commit d8115973e8
2 changed files with 4 additions and 5 deletions

View File

@@ -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);