diff --git a/app/dialog/export/codec/h264section.h b/app/dialog/export/codec/h264section.h index b6ef70514..0a00f18f6 100644 --- a/app/dialog/export/codec/h264section.h +++ b/app/dialog/export/codec/h264section.h @@ -40,12 +40,12 @@ public: int GetValue() const; void SetValue(int c); - static const int kDefaultH264CRF = 18; - static const int kDefaultH265CRF = 23; + static constexpr int kDefaultH264CRF = 18; + static constexpr int kDefaultH265CRF = 23; private: - static const int kMinimumCRF = 0; - static const int kMaximumCRF = 51; + static constexpr int kMinimumCRF = 0; + static constexpr int kMaximumCRF = 51; QSlider *crf_slider_; }; diff --git a/app/dialog/export/exportformatcombobox.h b/app/dialog/export/exportformatcombobox.h index 82890ff85..ec30a38d4 100644 --- a/app/dialog/export/exportformatcombobox.h +++ b/app/dialog/export/exportformatcombobox.h @@ -71,7 +71,7 @@ private: Menu *custom_menu_; - ExportFormat::Format current_; + ExportFormat::Format current_ = ExportFormat::kFormatCount; }; } diff --git a/app/dialog/export/exportsubtitlestab.h b/app/dialog/export/exportsubtitlestab.h index c54a4a006..ecb3a84bc 100644 --- a/app/dialog/export/exportsubtitlestab.h +++ b/app/dialog/export/exportsubtitlestab.h @@ -44,7 +44,7 @@ public: } void SetSidecarEnabled(bool e) { - sidecar_checkbox_->setEnabled(e); + sidecar_checkbox_->setChecked(e); } ExportFormat::Format GetSidecarFormat() const diff --git a/app/dialog/sequence/sequencepreset.h b/app/dialog/sequence/sequencepreset.h index f36bd5a54..0c105b866 100644 --- a/app/dialog/sequence/sequencepreset.h +++ b/app/dialog/sequence/sequencepreset.h @@ -70,7 +70,10 @@ public: } else if (reader->name() == QStringLiteral("pixelaspect")) { pixel_aspect_ = rational::fromString( reader->readElementText().toStdString()); - } else if (reader->name() == QStringLiteral("interlacing")) { + } else if (reader->name() == QStringLiteral("interlacing") || + reader->name() == QStringLiteral("interlacing_")) { + // "interlacing_" is the element name mistakenly written by + // older versions of Save(); accept it for backward compatibility interlacing_ = static_cast( reader->readElementText().toInt()); } else if (reader->name() == QStringLiteral("samplerate")) { @@ -103,7 +106,7 @@ public: writer->writeTextElement( QStringLiteral("pixelaspect"), QString::fromStdString(pixel_aspect_.toString())); - writer->writeTextElement(QStringLiteral("interlacing_"), + writer->writeTextElement(QStringLiteral("interlacing"), QString::number(interlacing_)); writer->writeTextElement(QStringLiteral("samplerate"), QString::number(sample_rate_));