Skip to content

Commit

Permalink
feat: allow to convert VP8 to MP4 instead of remux (fix #3115)
Browse files Browse the repository at this point in the history
  • Loading branch information
Bionus committed May 5, 2024
1 parent 4f691c2 commit cbd91e5
Show file tree
Hide file tree
Showing 5 changed files with 140 additions and 72 deletions.
4 changes: 3 additions & 1 deletion src/gui/src/settings/options-window.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
#include "viewer/viewer-window-buttons.h"


void disableItem(QComboBox *combo, const int index, const QString &toolTip = {}) {
void disableItem(QComboBox *combo, int index, const QString &toolTip = {}) {
auto *model = qobject_cast<QStandardItemModel*>(combo->model());
QStandardItem *item = model->item(index);
item->setFlags(item->flags() & ~Qt::ItemIsEnabled);
Expand Down Expand Up @@ -172,6 +172,7 @@ OptionsWindow::OptionsWindow(Profile *profile, ThemeLoader *themeLoader, QWidget

// Video conversion
ui->checkConversionFFmpegRemuxWebmToMp4->setChecked(settings->value("Save/FFmpegRemuxWebmToMp4", false).toBool());
ui->checkConversionFFmpegConvertWebmToMp4->setChecked(settings->value("Save/FFmpegConvertWebmToMp4", false).toBool());

// Image conversion
ui->comboConversionImageBackend->setCurrentText(settings->value("Save/ImageConversionBackend", "ImageMagick").toString());
Expand Down Expand Up @@ -1344,6 +1345,7 @@ void OptionsWindow::save()

// Video conversion
settings->setValue("FFmpegRemuxWebmToMp4", ui->checkConversionFFmpegRemuxWebmToMp4->isChecked());
settings->setValue("FFmpegConvertWebmToMp4", ui->checkConversionFFmpegConvertWebmToMp4->isChecked());

// Image conversion
settings->setValue("ImageConversionBackend", ui->comboConversionImageBackend->currentText());
Expand Down
Loading

0 comments on commit cbd91e5

Please sign in to comment.