diff --git a/app/codec/encoder.cpp b/app/codec/encoder.cpp index 9bedc6b8f..eec326526 100644 --- a/app/codec/encoder.cpp +++ b/app/codec/encoder.cpp @@ -115,10 +115,9 @@ void EncodingParams::EnableAudio(const AudioParams &audio_params, const ExportCo audio_codec_ = acodec; } -void EncodingParams::EnableSubtitles(const SubtitleParams::Encoding &encoding, const ExportCodec::Codec &scodec) +void EncodingParams::EnableSubtitles(const ExportCodec::Codec &scodec) { subtitles_enabled_ = true; - subtitles_encoding_ = encoding; subtitles_codec_ = scodec; } @@ -232,11 +231,6 @@ bool EncodingParams::subtitles_enabled() const return subtitles_enabled_; } -SubtitleParams::Encoding EncodingParams::subtitles_encoding() const -{ - return subtitles_encoding_; -} - ExportCodec::Codec EncodingParams::subtitles_codec() const { return subtitles_codec_; diff --git a/app/codec/encoder.h b/app/codec/encoder.h index 49466c6a5..ace7bf7a0 100644 --- a/app/codec/encoder.h +++ b/app/codec/encoder.h @@ -49,7 +49,7 @@ public: void EnableVideo(const VideoParams& video_params, const ExportCodec::Codec& vcodec); void EnableAudio(const AudioParams& audio_params, const ExportCodec::Codec &acodec); - void EnableSubtitles(const SubtitleParams::Encoding &encoding, const ExportCodec::Codec &scodec); + void EnableSubtitles(const ExportCodec::Codec &scodec); void set_video_option(const QString& key, const QString& value); void set_video_bit_rate(const int64_t& rate); @@ -95,7 +95,6 @@ public: } bool subtitles_enabled() const; - SubtitleParams::Encoding subtitles_encoding() const; ExportCodec::Codec subtitles_codec() const; const rational& GetExportLength() const; @@ -125,7 +124,6 @@ private: bool subtitles_enabled_; ExportCodec::Codec subtitles_codec_; - SubtitleParams::Encoding subtitles_encoding_; rational export_length_; diff --git a/app/codec/exportcodec.cpp b/app/codec/exportcodec.cpp index 039537651..bb2834ecb 100644 --- a/app/codec/exportcodec.cpp +++ b/app/codec/exportcodec.cpp @@ -97,31 +97,4 @@ bool ExportCodec::IsCodecAStillImage(ExportCodec::Codec c) return false; } -SubtitleParams::Encoding ExportCodec::GetDefaultSubtitleEncoding(Codec c) -{ - switch (c) { - case kCodecSRT: - return SubtitleParams::kWindows1252; - case kCodecDNxHD: - case kCodecH264: - case kCodecH265: - case kCodecProRes: - case kCodecMP2: - case kCodecMP3: - case kCodecAAC: - case kCodecPCM: - case kCodecVorbis: - case kCodecOpus: - case kCodecFLAC: - case kCodecVP9: - case kCodecOpenEXR: - case kCodecPNG: - case kCodecTIFF: - case kCodecCount: - break; - } - - return SubtitleParams::kEncodingInvalid; -} - } diff --git a/app/codec/exportcodec.h b/app/codec/exportcodec.h index ee1a3a1c0..1a2cb3c05 100644 --- a/app/codec/exportcodec.h +++ b/app/codec/exportcodec.h @@ -63,8 +63,6 @@ public: static bool IsCodecAStillImage(Codec c); - static SubtitleParams::Encoding GetDefaultSubtitleEncoding(Codec c); - }; } diff --git a/app/dialog/export/export.cpp b/app/dialog/export/export.cpp index c3d31fda9..16e0bb8ae 100644 --- a/app/dialog/export/export.cpp +++ b/app/dialog/export/export.cpp @@ -563,7 +563,7 @@ ExportParams ExportDialog::GenerateParams() const } if (subtitles_enabled_->isChecked()) { - params.EnableSubtitles(subtitle_tab_->GetSubtitleEncoding(), subtitle_tab_->GetSubtitleCodec()); + params.EnableSubtitles(subtitle_tab_->GetSubtitleCodec()); } return params; diff --git a/app/dialog/export/exportsubtitlestab.cpp b/app/dialog/export/exportsubtitlestab.cpp index 5c535b60b..27c40fc16 100644 --- a/app/dialog/export/exportsubtitlestab.cpp +++ b/app/dialog/export/exportsubtitlestab.cpp @@ -20,16 +20,6 @@ ExportSubtitlesTab::ExportSubtitlesTab(QWidget *parent) : codec_combobox_ = new QComboBox(); layout->addWidget(codec_combobox_, row, 1); - row++; - - layout->addWidget(new QLabel(tr("Encoding:")), row, 0); - - encoding_combobox_ = new QComboBox(); - for (int i=0; iaddItem(SubtitleParams::GetEncodingName(static_cast(i)), i); - } - layout->addWidget(encoding_combobox_, row, 1); - outer_layout->addStretch(); } diff --git a/app/dialog/export/exportsubtitlestab.h b/app/dialog/export/exportsubtitlestab.h index f3beaa10b..fd160c91b 100644 --- a/app/dialog/export/exportsubtitlestab.h +++ b/app/dialog/export/exportsubtitlestab.h @@ -40,16 +40,9 @@ public: return static_cast(codec_combobox_->currentData().toInt()); } - SubtitleParams::Encoding GetSubtitleEncoding() - { - return static_cast(encoding_combobox_->currentData().toInt()); - } - private: QComboBox *codec_combobox_; - QComboBox *encoding_combobox_; - }; } diff --git a/app/render/subtitleparams.cpp b/app/render/subtitleparams.cpp index d864e58e8..ceaa06f82 100644 --- a/app/render/subtitleparams.cpp +++ b/app/render/subtitleparams.cpp @@ -24,92 +24,6 @@ namespace olive { -QString SubtitleParams::GetEncodingName(Encoding encoding) -{ - switch (encoding) { - case kISO8859_1: - return QCoreApplication::translate("SubtitleParams", "ASCII/ISO 8859-1"); - case kWindows1252: - return QCoreApplication::translate("SubtitleParams", "Windows-1252"); - case kUTF8: - return QCoreApplication::translate("SubtitleParams", "UTF-8"); - case kUTF8WithBOM: - return QCoreApplication::translate("SubtitleParams", "UTF-8 with BOM"); - case kUTF16LE: - return QCoreApplication::translate("SubtitleParams", "UTF-16LE"); - case kUTF16BE: - return QCoreApplication::translate("SubtitleParams", "UTF-16BE"); - case kEncodingInvalid: - case kEncodingCount: - break; - } - - return QCoreApplication::translate("SubtitleParams", "Unknown"); -} - -bool SubtitleParams::EncodingHasUnicodeBOM(Encoding encoding) -{ - switch (encoding) { - case kUTF8WithBOM: - case kUTF16LE: - case kUTF16BE: - return true; - - case kISO8859_1: - case kWindows1252: - case kUTF8: - case kEncodingInvalid: - case kEncodingCount: - break; - } - - return false; -} - -QByteArray SubtitleParams::GetUnicodeBOM(Encoding encoding) -{ - QByteArray arr; - - if (encoding == kUTF8WithBOM) { - arr.resize(3); - arr[0] = 0xEF; - arr[1] = 0xBB; - arr[2] = 0xBF; - } else if (encoding == kUTF16LE) { - arr.resize(2); - arr[0] = 0xFF; - arr[1] = 0xFE; - } else if (encoding == kUTF16BE) { - arr.resize(2); - arr[0] = 0xFE; - arr[1] = 0xFF; - } - - return arr; -} - -const char *SubtitleParams::GetQTextStreamCodec(Encoding encoding) -{ - switch (encoding) { - case SubtitleParams::kISO8859_1: - return "ISO 8859-1"; - case SubtitleParams::kWindows1252: - return "Windows-1252"; - case SubtitleParams::kUTF8: - case SubtitleParams::kUTF8WithBOM: - return "UTF-8"; - case SubtitleParams::kUTF16LE: - return "UTF-16LE"; - case SubtitleParams::kUTF16BE: - return "UTF-16BE"; - case SubtitleParams::kEncodingInvalid: - case SubtitleParams::kEncodingCount: - break; - } - - return nullptr; -} - QString SubtitleParams::GenerateASSHeader() { // NOTE: We'll probably implement more customization as we support ASS better. Right now, we only diff --git a/app/render/subtitleparams.h b/app/render/subtitleparams.h index 241cccc33..c72f9c25c 100644 --- a/app/render/subtitleparams.h +++ b/app/render/subtitleparams.h @@ -27,25 +27,6 @@ namespace olive { class SubtitleParams { public: - enum Encoding { - kEncodingInvalid = -1, - kISO8859_1, - kWindows1252, - kUTF8, - kUTF8WithBOM, - kUTF16LE, - kUTF16BE, - kEncodingCount - }; - - static QString GetEncodingName(Encoding encoding); - - static bool EncodingHasUnicodeBOM(Encoding encoding); - - static QByteArray GetUnicodeBOM(Encoding encoding); - - static const char *GetQTextStreamCodec(Encoding encoding); - static QString GenerateASSHeader(); };