UI: Add memory usage to Stats window on linux/mac

Closes jp9000/obs-studio#953
This commit is contained in:
mntone
2017-09-12 00:24:35 -07:00
committed by jp9000
parent a6318ffdca
commit 9ffdaff984
3 changed files with 1 additions and 20 deletions

View File

@@ -57,15 +57,11 @@ OBSBasicStats::OBSBasicStats(QWidget *parent)
cpuUsage = new QLabel(this);
hddSpace = new QLabel(this);
#ifdef _WIN32
memUsage = new QLabel(this);
#endif
newStat("CPUUsage", cpuUsage, 0);
newStat("HDDSpaceAvailable", hddSpace, 0);
#ifdef _WIN32
newStat("MemoryUsage", memUsage, 0);
#endif
fps = new QLabel(this);
renderTime = new QLabel(this);
@@ -300,12 +296,10 @@ void OBSBasicStats::Update()
/* ------------------ */
#ifdef _WIN32
num = (long double)CurrentMemoryUsage() / (1024.0l * 1024.0l);
num = (long double)os_get_proc_resident_size() / (1024.0l * 1024.0l);
str = QString::number(num, 'f', 1) + QStringLiteral(" MB");
memUsage->setText(str);
#endif
/* ------------------ */