Mirrors/obs-aitum-multistream
1
0
Fork 0
mirror of https://github.com/Aitum/obs-aitum-multistream.git synced 2024-11-21 18:02:33 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

remove downscale disabled option

Browse Source
This commit is contained in:
Exeldro 2024-08-02 08:50:25 +02:00
parent 6136896cc7
commit 907bc3abda
No known key found for this signature in database
GPG Key ID: 97269A83FC715751
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
config-dialog.cpp
View File

@ -588,7 +588,8 @@ void OBSBasicSettings::AddServer(QFormLayout *outputsLayout, obs_data_t *setting
// VIDEO ENCODER // VIDEO ENCODER
auto videoEncoder = new QComboBox; auto videoEncoder = new QComboBox;
videoEncoder->addItem(QString::fromUtf8(obs_module_text(main ? "MainEncoder" : "VerticalEncoder")), QVariant(QString::fromUtf8(""))); videoEncoder->addItem(QString::fromUtf8(obs_module_text(main ? "MainEncoder" : "VerticalEncoder")),
QVariant(QString::fromUtf8("")));
videoEncoder->setCurrentIndex(0); videoEncoder->setCurrentIndex(0);
videoPageLayout->addRow(QString::fromUtf8(obs_module_text("VideoEncoder")), videoEncoder); videoPageLayout->addRow(QString::fromUtf8(obs_module_text("VideoEncoder")), videoEncoder);
@ -663,28 +664,29 @@ void OBSBasicSettings::AddServer(QFormLayout *outputsLayout, obs_data_t *setting
auto downscale = new QComboBox; auto downscale = new QComboBox;
auto downscale_type = obs_data_get_int(settings, "scale_type"); auto downscale_type = obs_data_get_int(settings, "scale_type");
downscale->addItem(QString::fromUtf8(obs_frontend_get_locale_string("Basic.Settings.Output.Adv.Rescale.Disabled")), if (downscale_type == OBS_SCALE_DISABLE) {
OBS_SCALE_DISABLE); downscale_type = OBS_SCALE_BILINEAR;
downscale->setCurrentIndex(0); obs_data_set_int(settings, "scale_type", downscale_type);
}
downscale->addItem( downscale->addItem(
QString::fromUtf8(obs_frontend_get_locale_string("Basic.Settings.Video.DownscaleFilter.Bilinear")), QString::fromUtf8(obs_frontend_get_locale_string("Basic.Settings.Video.DownscaleFilter.Bilinear")),
OBS_SCALE_BILINEAR); OBS_SCALE_BILINEAR);
if (downscale_type == OBS_SCALE_BILINEAR) if (downscale_type == OBS_SCALE_BILINEAR)
downscale->setCurrentIndex(1); downscale->setCurrentIndex(0);
downscale->addItem(QString::fromUtf8(obs_frontend_get_locale_string("Basic.Settings.Video.DownscaleFilter.Area")), downscale->addItem(QString::fromUtf8(obs_frontend_get_locale_string("Basic.Settings.Video.DownscaleFilter.Area")),
OBS_SCALE_AREA); OBS_SCALE_AREA);
if (downscale_type == OBS_SCALE_AREA) if (downscale_type == OBS_SCALE_AREA)
downscale->setCurrentIndex(2); downscale->setCurrentIndex(1);
downscale->addItem( downscale->addItem(
QString::fromUtf8(obs_frontend_get_locale_string("Basic.Settings.Video.DownscaleFilter.Bicubic")), QString::fromUtf8(obs_frontend_get_locale_string("Basic.Settings.Video.DownscaleFilter.Bicubic")),
OBS_SCALE_BICUBIC); OBS_SCALE_BICUBIC);
if (downscale_type == OBS_SCALE_BICUBIC) if (downscale_type == OBS_SCALE_BICUBIC)
downscale->setCurrentIndex(3); downscale->setCurrentIndex(2);
downscale->addItem( downscale->addItem(
QString::fromUtf8(obs_frontend_get_locale_string("Basic.Settings.Video.DownscaleFilter.Lanczos")), QString::fromUtf8(obs_frontend_get_locale_string("Basic.Settings.Video.DownscaleFilter.Lanczos")),
OBS_SCALE_LANCZOS); OBS_SCALE_LANCZOS);
if (downscale_type == OBS_SCALE_LANCZOS) if (downscale_type == OBS_SCALE_LANCZOS)
downscale->setCurrentIndex(4); downscale->setCurrentIndex(3);
connect(downscale, &QComboBox::currentIndexChanged, connect(downscale, &QComboBox::currentIndexChanged,
[downscale, settings] { obs_data_set_int(settings, "scale_type", downscale->currentData().toInt()); }); [downscale, settings] { obs_data_set_int(settings, "scale_type", downscale->currentData().toInt()); });
@ -785,7 +787,8 @@ void OBSBasicSettings::AddServer(QFormLayout *outputsLayout, obs_data_t *setting
videoEncoderGroup->setVisible(false); videoEncoderGroup->setVisible(false);
auto audioEncoder = new QComboBox; auto audioEncoder = new QComboBox;
audioEncoder->addItem(QString::fromUtf8(obs_module_text(main ? "MainEncoder" : "VerticalEncoder")), QVariant(QString::fromUtf8(""))); audioEncoder->addItem(QString::fromUtf8(obs_module_text(main ? "MainEncoder" : "VerticalEncoder")),
QVariant(QString::fromUtf8("")));
audioEncoder->setCurrentIndex(0); audioEncoder->setCurrentIndex(0);
audioPageLayout->addRow(QString::fromUtf8(obs_module_text("AudioEncoder")), audioEncoder); audioPageLayout->addRow(QString::fromUtf8(obs_module_text("AudioEncoder")), audioEncoder);