diff --git a/obs/data/locale/en-US.ini b/obs/data/locale/en-US.ini index ea7417a11ed8e7469d17e942f124b4ebf19a9ecb..090dee77722abbf09c72bc61e5163559fe56337f 100644 --- a/obs/data/locale/en-US.ini +++ b/obs/data/locale/en-US.ini @@ -227,7 +227,7 @@ Basic.Settings.Output.RetryDelay="Retry Delay (seconds)" Basic.Settings.Output.MaxRetries="Maximum Retries" Basic.Settings.Output.Advanced="Enable Advanced Encoder Settings" Basic.Settings.Output.X264Preset="x264 Preset" -Basic.Settings.Output.CustomX264Settings="Custom x264 Settings" +Basic.Settings.Output.CustomEncoderSettings="Custom Encoder Settings" Basic.Settings.Output.UseCBR="Use Constant Bitrate" # basic mode 'video' settings diff --git a/obs/forms/OBSBasicSettings.ui b/obs/forms/OBSBasicSettings.ui index 9afe744653c4e86cc847d071592c22fb1d9d6b11..b5738bb537e6974e5e731d5bfbb7f6458cb1a7a7 100644 --- a/obs/forms/OBSBasicSettings.ui +++ b/obs/forms/OBSBasicSettings.ui @@ -525,12 +525,12 @@ - + - Basic.Settings.Output.CustomX264Settings + Basic.Settings.Output.CustomEncoderSettings @@ -1222,7 +1222,7 @@ simpleOutAdvanced toggled(bool) - simpleOutCustomX264 + simpleOutCustom setVisible(bool) diff --git a/obs/window-basic-settings.cpp b/obs/window-basic-settings.cpp index c739dc442486ba787ee3d8a8d340e5220250fa1a..afa9b42e984271044af834978c44b1b5a30568b0 100644 --- a/obs/window-basic-settings.cpp +++ b/obs/window-basic-settings.cpp @@ -148,7 +148,7 @@ OBSBasicSettings::OBSBasicSettings(QWidget *parent) HookWidget(ui->simpleOutAdvanced, CHECK_CHANGED, OUTPUTS_CHANGED); HookWidget(ui->simpleOutUseCBR, CHECK_CHANGED, OUTPUTS_CHANGED); HookWidget(ui->simpleOutPreset, COMBO_CHANGED, OUTPUTS_CHANGED); - HookWidget(ui->simpleOutCustomX264, EDIT_CHANGED, OUTPUTS_CHANGED); + HookWidget(ui->simpleOutCustom, EDIT_CHANGED, OUTPUTS_CHANGED); HookWidget(ui->channelSetup, COMBO_CHANGED, AUDIO_RESTART); HookWidget(ui->sampleRate, COMBO_CHANGED, AUDIO_RESTART); HookWidget(ui->desktopAudioDevice1, COMBO_CHANGED, AUDIO_CHANGED); @@ -478,7 +478,7 @@ void OBSBasicSettings::LoadSimpleOutputSettings() ui->simpleOutAdvanced->setChecked(advanced); ui->simpleOutUseCBR->setChecked(useCBR); ui->simpleOutPreset->setCurrentText(preset); - ui->simpleOutCustomX264->setText(custom); + ui->simpleOutCustom->setText(custom); } void OBSBasicSettings::LoadOutputSettings() @@ -655,7 +655,7 @@ void OBSBasicSettings::SaveOutputSettings() SaveCheckBox(ui->simpleOutAdvanced, "SimpleOutput", "UseAdvanced"); SaveCheckBox(ui->simpleOutUseCBR, "SimpleOutput", "UseCBR"); SaveCombo(ui->simpleOutPreset, "SimpleOutput", "Preset"); - SaveEdit(ui->simpleOutCustomX264, "SimpleOutput", "x264Settings"); + SaveEdit(ui->simpleOutCustom, "SimpleOutput", "x264Settings"); } void OBSBasicSettings::SaveAudioSettings()