New upstream version 18.0.1+dfsg1
This commit is contained in:
parent
6efda2859e
commit
f2cf6cce50
1337 changed files with 41178 additions and 84670 deletions
|
|
@ -14,9 +14,11 @@ class OBSBasicStatusBar : public QStatusBar {
|
|||
private:
|
||||
QLabel *delayInfo;
|
||||
QLabel *droppedFrames;
|
||||
QLabel *sessionTime;
|
||||
QLabel *streamTime;
|
||||
QLabel *recordTime;
|
||||
QLabel *cpuUsage;
|
||||
QLabel *kbps;
|
||||
QLabel *statusSquare;
|
||||
|
||||
obs_output_t *streamOutput = nullptr;
|
||||
obs_output_t *recordOutput = nullptr;
|
||||
|
|
@ -24,7 +26,8 @@ private:
|
|||
bool overloadedNotify = true;
|
||||
|
||||
int retries = 0;
|
||||
int totalSeconds = 0;
|
||||
int totalStreamSeconds = 0;
|
||||
int totalRecordSeconds = 0;
|
||||
|
||||
int reconnectTimeout = 0;
|
||||
|
||||
|
|
@ -40,6 +43,13 @@ private:
|
|||
uint64_t lastBytesSent = 0;
|
||||
uint64_t lastBytesSentTime = 0;
|
||||
|
||||
QPixmap transparentPixmap;
|
||||
QPixmap greenPixmap;
|
||||
QPixmap grayPixmap;
|
||||
QPixmap redPixmap;
|
||||
|
||||
float lastCongestion = 0.0f;
|
||||
|
||||
QPointer<QTimer> refreshTimer;
|
||||
|
||||
obs_output_t *GetOutput();
|
||||
|
|
@ -49,7 +59,8 @@ private:
|
|||
|
||||
void UpdateDelayMsg();
|
||||
void UpdateBandwidth();
|
||||
void UpdateSessionTime();
|
||||
void UpdateStreamTime();
|
||||
void UpdateRecordTime();
|
||||
void UpdateDroppedFrames();
|
||||
|
||||
static void OBSOutputReconnect(void *data, calldata_t *params);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue