From 105a6bd68a235aedcd5302206cf83b8bfb37266b Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Tue, 14 Feb 2012 00:35:16 +0000 Subject: [PATCH] Force Encore subtitles to UTF-8 as Encore doesn't like non-unicode encodings Originally committed to SVN as r6469. --- aegisub/src/subtitle_format_encore.cpp | 5 ++--- aegisub/src/subtitle_format_encore.h | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/aegisub/src/subtitle_format_encore.cpp b/aegisub/src/subtitle_format_encore.cpp index d1f1ed76b..a0d726fde 100644 --- a/aegisub/src/subtitle_format_encore.cpp +++ b/aegisub/src/subtitle_format_encore.cpp @@ -53,12 +53,10 @@ wxArrayString EncoreSubtitleFormat::GetWriteWildcards() const { return formats; } -void EncoreSubtitleFormat::WriteFile(const AssFile *src, wxString const& filename, wxString const& encoding) const { +void EncoreSubtitleFormat::WriteFile(const AssFile *src, wxString const& filename, wxString const&) const { FractionalTime ft = AskForFPS(true); if (!ft.FPS().IsLoaded()) return; - TextFileWriter file(filename, encoding); - // Convert to encore AssFile copy(*src); copy.Sort(); @@ -74,6 +72,7 @@ void EncoreSubtitleFormat::WriteFile(const AssFile *src, wxString const& filenam // Encore wants ; instead of : if we're dealing with NTSC dropframe stuff char sep = ft.IsDrop() ? ';' : ':'; + TextFileWriter file(filename, "UTF-8"); for (LineList::const_iterator cur = copy.Line.begin(); cur != copy.Line.end(); ++cur) { if (AssDialogue *current = dynamic_cast(*cur)) { ++i; diff --git a/aegisub/src/subtitle_format_encore.h b/aegisub/src/subtitle_format_encore.h index 552297405..dd163088e 100644 --- a/aegisub/src/subtitle_format_encore.h +++ b/aegisub/src/subtitle_format_encore.h @@ -46,5 +46,5 @@ class EncoreSubtitleFormat : public SubtitleFormat { public: EncoreSubtitleFormat(); wxArrayString GetWriteWildcards() const; - void WriteFile(const AssFile *src, wxString const& filename, wxString const& encoding) const; + void WriteFile(const AssFile *src, wxString const& filename, wxString const&) const; };