mirror/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-01-24 22:28:34 -05:00
Code Issues Packages Projects Releases Wiki Activity

clang-format: Increase column limit from 80 to 120

Browse Source
This commit is contained in:
Ryan Foster
2024-10-04 17:33:58 -04:00
parent 109f64c446
commit a1fbf1015f
736 changed files with 22684 additions and 45435 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
UI/window-basic-stats.cpp
View File

@@ -42,17 +42,13 @@ void OBSBasicStats::OBSFrontendEvent(enum obs_frontend_event event, void *ptr)
static QString MakeTimeLeftText(int hours, int minutes)
{
return QString::asprintf("%d %s, %d %s", hours, Str("Hours"), minutes,
Str("Minutes"));
return QString::asprintf("%d %s, %d %s", hours, Str("Hours"), minutes, Str("Minutes"));
}
static QString MakeMissedFramesText(uint32_t total_lagged,
uint32_t total_rendered, long double num)
static QString MakeMissedFramesText(uint32_t total_lagged, uint32_t total_rendered, long double num)
{
return QString("%1 / %2 (%3%)")
.arg(QString::number(total_lagged),
QString::number(total_rendered),
QString::number(num, 'f', 1));
.arg(QString::number(total_lagged), QString::number(total_rendered), QString::number(num, 'f', 1));
}
OBSBasicStats::OBSBasicStats(QWidget *parent, bool closable)
@@ -166,8 +162,7 @@ OBSBasicStats::OBSBasicStats(QWidget *parent, bool closable)
/* --------------------------------------------- */
if (closable)
connect(closeButton, &QPushButton::clicked,
[this]() { close(); });
connect(closeButton, &QPushButton::clicked, [this]() { close(); });
connect(resetButton, &QPushButton::clicked, [this]() { Reset(); });
delete shortcutFilter;
@@ -178,8 +173,7 @@ OBSBasicStats::OBSBasicStats(QWidget *parent, bool closable)
setWindowTitle(QTStr("Basic.Stats"));
#ifdef __APPLE__
setWindowIcon(
QIcon::fromTheme("obs", QIcon(":/res/images/obs_256x256.png")));
setWindowIcon(QIcon::fromTheme("obs", QIcon(":/res/images/obs_256x256.png")));
#else
setWindowIcon(QIcon::fromTheme("obs", QIcon(":/res/images/obs.png")));
#endif
@@ -187,8 +181,7 @@ OBSBasicStats::OBSBasicStats(QWidget *parent, bool closable)
setWindowModality(Qt::NonModal);
setAttribute(Qt::WA_DeleteOnClose, true);
QObject::connect(&timer, &QTimer::timeout, this,
&OBSBasicStats::Update);
QObject::connect(&timer, &QTimer::timeout, this, &OBSBasicStats::Update);
timer.setInterval(TIMER_INTERVAL);
if (isVisible())
@@ -196,26 +189,20 @@ OBSBasicStats::OBSBasicStats(QWidget *parent, bool closable)
Update();
QObject::connect(&recTimeLeft, &QTimer::timeout, this,
&OBSBasicStats::RecordingTimeLeft);
QObject::connect(&recTimeLeft, &QTimer::timeout, this, &OBSBasicStats::RecordingTimeLeft);
recTimeLeft.setInterval(REC_TIME_LEFT_INTERVAL);
OBSBasic *main = reinterpret_cast<OBSBasic *>(App()->GetMainWindow());
const char *geometry =
config_get_string(main->Config(), "Stats", "geometry");
const char *geometry = config_get_string(main->Config(), "Stats", "geometry");
if (geometry != NULL) {
QByteArray byteArray =
QByteArray::fromBase64(QByteArray(geometry));
QByteArray byteArray = QByteArray::fromBase64(QByteArray(geometry));
restoreGeometry(byteArray);
QRect windowGeometry = normalGeometry();
if (!WindowPositionValid(windowGeometry)) {
QRect rect =
QGuiApplication::primaryScreen()->geometry();
setGeometry(QStyle::alignedRect(Qt::LeftToRight,
Qt::AlignCenter, size(),
rect));
QRect rect = QGuiApplication::primaryScreen()->geometry();
setGeometry(QStyle::alignedRect(Qt::LeftToRight, Qt::AlignCenter, size(), rect));
}
}
@@ -229,8 +216,7 @@ void OBSBasicStats::closeEvent(QCloseEvent *event)
{
OBSBasic *main = reinterpret_cast<OBSBasic *>(App()->GetMainWindow());
if (isVisible()) {
config_set_string(main->Config(), "Stats", "geometry",
saveGeometry().toBase64().constData());
config_set_string(main->Config(), "Stats", "geometry", saveGeometry().toBase64().constData());
config_save_safe(main->Config(), "tmp", nullptr);
}
@@ -361,8 +347,7 @@ void OBSBasicStats::Update()
str = QString::number(num, 'f', 1) + QStringLiteral(" ms");
renderTime->setText(str);
long double fpsFrameTime =
(long double)ovi.fps_den * 1000.0l / (long double)ovi.fps_num;
long double fpsFrameTime = (long double)ovi.fps_den * 1000.0l / (long double)ovi.fps_num;
if (num > fpsFrameTime)
setClasses(renderTime, "text-danger");
@@ -384,14 +369,11 @@ void OBSBasicStats::Update()
total_encoded -= first_encoded;
total_skipped -= first_skipped;
num = total_encoded
? (long double)total_skipped / (long double)total_encoded
: 0.0l;
num = total_encoded ? (long double)total_skipped / (long double)total_encoded : 0.0l;
num *= 100.0l;
str = QString("%1 / %2 (%3%)")
.arg(QString::number(total_skipped),
QString::number(total_encoded),
.arg(QString::number(total_skipped), QString::number(total_encoded),
QString::number(num, 'f', 1));
skippedFrames->setText(str);
@@ -414,9 +396,7 @@ void OBSBasicStats::Update()
total_rendered -= first_rendered;
total_lagged -= first_lagged;
num = total_rendered
? (long double)total_lagged / (long double)total_rendered
: 0.0l;
num = total_rendered ? (long double)total_lagged / (long double)total_rendered : 0.0l;
num *= 100.0l;
str = MakeMissedFramesText(total_lagged, total_rendered, num);
@@ -464,9 +444,7 @@ void OBSBasicStats::RecordingTimeLeft()
if (bitrates.empty())
return;
long double averageBitrate =
accumulate(bitrates.begin(), bitrates.end(), 0.0) /
(long double)bitrates.size();
long double averageBitrate = accumulate(bitrates.begin(), bitrates.end(), 0.0) / (long double)bitrates.size();
if (averageBitrate == 0)
return;
@@ -513,8 +491,7 @@ void OBSBasicStats::OutputLabels::Update(obs_output_t *output, bool rec)
lastBytesSent = 0;
uint64_t bitsBetween = (bytesSent - lastBytesSent) * 8;
long double timePassed =
(long double)(curTime - lastBytesSentTime) / 1000000000.0l;
long double timePassed = (long double)(curTime - lastBytesSentTime) / 1000000000.0l;
kbps = (long double)bitsBetween / timePassed / 1000.0l;
if (timePassed < 0.01l)
@@ -528,9 +505,7 @@ void OBSBasicStats::OutputLabels::Update(obs_output_t *output, bool rec)
str = QTStr("Basic.Stats.Status.Recording");
} else {
if (active) {
bool reconnecting =
output ? obs_output_reconnecting(output)
: false;
bool reconnecting = output ? obs_output_reconnecting(output) : false;
if (reconnecting) {
str = QTStr("Basic.Stats.Status.Reconnecting");
@@ -563,8 +538,7 @@ void OBSBasicStats::OutputLabels::Update(obs_output_t *output, bool rec)
if (!rec) {
int total = output ? obs_output_get_total_frames(output) : 0;
int dropped = output ? obs_output_get_frames_dropped(output)
: 0;
int dropped = output ? obs_output_get_frames_dropped(output) : 0;
if (total < first_total || dropped < first_dropped) {
first_total = 0;
@@ -574,13 +548,10 @@ void OBSBasicStats::OutputLabels::Update(obs_output_t *output, bool rec)
total -= first_total;
dropped -= first_dropped;
num = total ? (long double)dropped / (long double)total * 100.0l
: 0.0l;
num = total ? (long double)dropped / (long double)total * 100.0l : 0.0l;
str = QString("%1 / %2 (%3%)")
.arg(QString::number(dropped),
QString::number(total),
QString::number(num, 'f', 1));
.arg(QString::number(dropped), QString::number(total), QString::number(num, 'f', 1));
droppedFrames->setText(str);
if (num > 5.0l)