mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-28 16:01:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'neutrino-mp/master' into pu/mp

Browse Source 
Conflicts:
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/neutrinoyparser.cpp
This commit is contained in:
svenhoefer
2017-03-13 16:14:33 +01:00
parent 5b0faeab8c 40adaa6515
commit 8bdb16cec6
181 changed files with 6320 additions and 987 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/moviebrowser/mb.cpp
View File

@@ -30,7 +30,7 @@
Author: Guenther@tuxbox.berlios.org
based on code of Steffen Hehn 'McClean'
(C) 2009-2014 Stefan Seyfried
(C) 2009-2015 Stefan Seyfried
(C) 2016 Sven Hoefer
outsourced:
@@ -1553,7 +1553,7 @@ void CMovieBrowser::info_hdd_level(bool paint_hdd)
if (getSelectedFile() != NULL) {
if (::statfs(getSelectedFile()->Name.c_str(), &s) == 0) {
long blocks_used = s.f_blocks - s.f_bfree;
blocks_percent_used = (long)(blocks_used * 100.0 / (blocks_used + s.f_bavail) + 0.5);
blocks_percent_used = (blocks_used * 1000 / (blocks_used + s.f_bavail) + 5)/10;
}
}