OBS/obs-studio
OBS/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-07-15 07:44:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

UI: Replace uses of token-pasting operator

Browse source
This commit is contained in:
derrod 2023-02-28 19:01:09 +01:00 committed by Rodney
parent 19b6d79597
commit 60844505d0
2 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
UI/frontend-plugins/frontend-tools/captions-handler.hpp
View file

@ -25,8 +25,8 @@ public:
typedef std::function<void(const std::string &)> captions_cb;
#define captions_error(s) std::string(obs_module_text("Captions.Error."##s))
#define CAPTIONS_ERROR_GENERIC_FAIL captions_error("GenericFail")
#define CAPTIONS_ERROR_GENERIC_FAIL \
std::string(obs_module_text("Captions.Error.GenericFail"))
/* ------------------------------------------------------------------------- */

23
UI/window-basic-settings.cpp
View file

@ -603,20 +603,21 @@ OBSBasicSettings::OBSBasicSettings(QWidget *parent)
ui->hideOBSFromCapture = nullptr;
}
#define PROCESS_PRIORITY(val) \
{ \
"Basic.Settings.Advanced.General.ProcessPriority."##val, val \
}
static struct ProcessPriority {
const char *name;
const char *val;
} processPriorities[] = {PROCESS_PRIORITY("High"),
PROCESS_PRIORITY("AboveNormal"),
PROCESS_PRIORITY("Normal"),
PROCESS_PRIORITY("BelowNormal"),
PROCESS_PRIORITY("Idle")};
#undef PROCESS_PRIORITY
} processPriorities[] = {
{"Basic.Settings.Advanced.General.ProcessPriority.High",
"High"},
{"Basic.Settings.Advanced.General.ProcessPriority.AboveNormal",
"AboveNormal"},
{"Basic.Settings.Advanced.General.ProcessPriority.Normal",
"Normal"},
{"Basic.Settings.Advanced.General.ProcessPriority.BelowNormal",
"BelowNormal"},
{"Basic.Settings.Advanced.General.ProcessPriority.Idle",
"Idle"},
};
for (ProcessPriority pri : processPriorities)
ui->processPriority->addItem(QTStr(pri.name), pri.val);