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

add thread for determining free hdd (recording dir) space, enable hdd usage icons on vfd (untested)

Browse Source 
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/driver/simple_display.cpp
	src/gui/hdd_menu.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/infoviewer_bb.h
	src/gui/moviebrowser.cpp
	src/gui/record_setup.cpp
	src/neutrino.cpp
	src/system/ytcache.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7c15db185f
Author: martii <m4rtii@gmx.de>
Date: 2013-11-27 (Wed, 27 Nov 2013)



------------------
This commit was generated by Migit
This commit is contained in:
martii
2013-11-27 20:08:32 +01:00
committed by [CST] Focus
parent 866bb6ecfc
commit 14f4b12384
15 changed files with 231 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/gui/infoviewer_bb.cpp
View File

@@ -51,6 +51,7 @@
#include <gui/pictureviewer.h>
#include <gui/movieplayer.h>
#include <system/helpers.h>
#include <system/hddstat.h>
#include <daemonc/remotecontrol.h>
#include <driver/volume.h>
@@ -80,9 +81,8 @@ CInfoViewerBB::CInfoViewerBB()
pthread_detach(scrambledT);
}
#endif
hddpercent = 0;
hddperT = 0;
hddperTflag = false;
hddscale = NULL;
sysscale = NULL;
bbIconInfo[0].x = 0;
bbIconInfo[0].h = 0;
BBarY = 0;
@@ -108,13 +108,6 @@ void CInfoViewerBB::Init()
bbButtonInfo[i].x = -1;
}
// get HDD info in a separate thread
if (g_settings.infobar_show_sysfs_hdd && !hddperTflag) {
hddperTflag=true;
pthread_create(&hddperT, NULL, hddperThread, (void*) this);
pthread_detach(hddperT);
}
InfoHeightY_Info = g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getHeight() + 5;
setBBOffset();
@@ -127,11 +120,10 @@ CInfoViewerBB::~CInfoViewerBB()
pthread_cancel(scrambledT);
scrambledT = 0;
}
if(hddperTflag) {
pthread_cancel(hddperT);
hddperT = 0;
hddperTflag = false;
}
if (hddscale)
delete hddscale;
if (sysscale)
delete sysscale;
}
CInfoViewerBB* CInfoViewerBB::getInstance()
@@ -653,25 +645,10 @@ void CInfoViewerBB::showSysfsHdd()
percent = (int)((u * 100ULL) / t);
showBarSys(percent);
if (check_dir(g_settings.network_nfs_recordingdir.c_str()) == 0)
showBarHdd(hddpercent);
else
showBarHdd(-1);
showBarHdd(cHddStat::getInstance()->getPercent());
}
}
void* CInfoViewerBB::hddperThread(void *arg)
{
CInfoViewerBB *infoViewerBB = (CInfoViewerBB*) arg;
uint64_t t, u;
if (get_fs_usage(g_settings.network_nfs_recordingdir.c_str(), t, u))
infoViewerBB->hddpercent = (int)((u * 100ULL) / t);
else
infoViewerBB->hddpercent = 0;
infoViewerBB->hddperTflag=false;
pthread_exit(NULL);
}
void CInfoViewerBB::showBarSys(int percent)
{
if (is_visible){