jp9000
/
obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add function to main window to query CPU usage

master
jp9000 2014-07-06 16:18:16 -07:00
parent 0364672cbb
commit a9b3da010d
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
obs/window-basic-main.cpp
View File

@ -88,6 +88,8 @@ OBSBasic::OBSBasic(QWidget *parent)
this, this,
SLOT(SceneItemNameEdited(QWidget*, SLOT(SceneItemNameEdited(QWidget*,
QAbstractItemDelegate::EndEditHint))); QAbstractItemDelegate::EndEditHint)));
cpuUsageInfo = os_cpu_usage_info_start();
} }
static void SaveAudioDevice(const char *name, int channel, obs_data_t parent) static void SaveAudioDevice(const char *name, int channel, obs_data_t parent)
@ -550,6 +552,8 @@ OBSBasic::~OBSBasic()
* can be freed, and we have no control over the destruction order of * can be freed, and we have no control over the destruction order of
* the Qt UI stuff, so we have to manually clear any references to * the Qt UI stuff, so we have to manually clear any references to
* libobs. */ * libobs. */
os_cpu_usage_info_destroy(cpuUsageInfo);
delete properties; delete properties;
delete transformWindow; delete transformWindow;

8
obs/window-basic-main.hpp
View File

@ -28,6 +28,7 @@
#include "window-basic-properties.hpp" #include "window-basic-properties.hpp"
#include "window-basic-transform.hpp" #include "window-basic-transform.hpp"
#include <util/platform.h>
#include <util/util.hpp> #include <util/util.hpp>
#include <QPointer> #include <QPointer>
@ -61,6 +62,8 @@ private:
QNetworkAccessManager networkManager; QNetworkAccessManager networkManager;
os_cpu_usage_info_t cpuUsageInfo = nullptr;
QBuffer logUploadPostData; QBuffer logUploadPostData;
QNetworkReply *logUploadReply = nullptr; QNetworkReply *logUploadReply = nullptr;
QByteArray logUploadReturnData; QByteArray logUploadReturnData;
@ -199,6 +202,11 @@ public:
cy = previewCY; cy = previewCY;
} }
inline double GetCPUUsage() const
{
return os_cpu_usage_info_query(cpuUsageInfo);
}
protected: protected:
virtual void closeEvent(QCloseEvent *event) override; virtual void closeEvent(QCloseEvent *event) override;
virtual void changeEvent(QEvent *event) override; virtual void changeEvent(QEvent *event) override;