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

UI: Use name instead of internal extension for incompatible codec check

Browse source
This commit is contained in:
gxalpha 2023-04-04 15:22:20 +02:00 committed by Ryan Foster
parent 69ac2b7aaa
commit 5444732c91
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -5013,11 +5013,11 @@ static bool ContainerSupportsCodec(const string &container, const string &codec)
}
static void DisableIncompatibleCodecs(QComboBox *cbox, const QString &format,
const QString &formatName,
const QString &streamEncoder)
{
QString strEncLabel =
QTStr("Basic.Settings.Output.Adv.Recording.UseStreamEncoder");
QString formatUpper = format.toUpper();
QString recEncoder = cbox->currentData().toString();
/* Check if selected encoders and output format are compatible, disable incompatible items. */
@ -5056,7 +5056,7 @@ static void DisableIncompatibleCodecs(QComboBox *cbox, const QString &format,
item->setFlags(Qt::NoItemFlags);
encDisplayName += " ";
encDisplayName += QTStr("CodecCompat.Incompatible")
.arg(formatUpper);
.arg(formatName);
}
item->setText(encDisplayName);
@ -5070,6 +5070,7 @@ static void DisableIncompatibleCodecs(QComboBox *cbox, const QString &format,
void OBSBasicSettings::AdvOutRecCheckCodecs()
{
QString recFormat = ui->advOutRecFormat->currentData().toString();
QString recFormatName = ui->advOutRecFormat->currentText();
/* Set tooltip if available */
QString tooltip =
@ -5088,9 +5089,9 @@ void OBSBasicSettings::AdvOutRecCheckCodecs()
ui->advOutRecEncoder->blockSignals(true);
ui->advOutRecAEncoder->blockSignals(true);
DisableIncompatibleCodecs(ui->advOutRecEncoder, recFormat,
streamEncoder);
recFormatName, streamEncoder);
DisableIncompatibleCodecs(ui->advOutRecAEncoder, recFormat,
streamAudioEncoder);
recFormatName, streamAudioEncoder);
ui->advOutRecEncoder->blockSignals(false);
ui->advOutRecAEncoder->blockSignals(false);