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

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Browse Source 
Conflicts:
	src/Makefile.am
	src/gui/imageinfo_ni.cpp
	src/gui/movieplayer.cpp
	src/gui/update.cpp
	src/gui/videosettings.cpp
	src/system/setting_helpers.cpp


Origin commit data
------------------
Commit: 4b934995ae
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)
This commit is contained in:
vanhofen
2017-02-12 22:17:17 +01:00
parent 227480877c e97d93f824
commit ba302de46b
46 changed files with 220 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/imageinfo_ni.cpp
View File

@@ -420,7 +420,7 @@ int CImageInfoNI::get_MTD_Info()
if (!(fh=fopen("/proc/mtd", "r")))
return false;
#ifdef BOXMODEL_APOLLO
#ifdef BOXMODEL_CS_HD2
std::string sysfs = get_systemRoot();
#else
std::string sysfs = "systemFS";
@@ -579,7 +579,7 @@ void CImageInfoNI::get_DF_Info()
if (!(pipe_reader = popen ("df", "r")))
printf("[read_df] popen error\n" );
#ifdef BOXMODEL_APOLLO
#ifdef BOXMODEL_CS_HD2
strcpy(mtd_info[systemfs].dev, ("mtd:"+get_systemRoot()).c_str());
#endif
@@ -844,7 +844,7 @@ void CImageInfoNI::paint_NET_Info(int posx, int posy)
#ifdef HAVE_GENERIC_HARDWARE
int max_bit = netMaxBit; /* PC */
#else
# ifdef BOXMODEL_APOLLO
# ifdef BOXMODEL_CS_HD2
int max_bit = 104857600; /* Shiner, Kronos */
if (cs_get_revision() == 9)
max_bit = 1073741824; /* Apollo */