Fix regression regarding handling subtitle text encoding

clsid2 · Feb 10, 2021 · 7ba4872 · 7ba4872
1 parent 4aa0ed0
commit 7ba4872
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 5 deletions.
diff --git a/src/Subtitles/TextFile.cpp b/src/Subtitles/TextFile.cpp
@@ -31,6 +31,7 @@
 CTextFile::CTextFile(enc e)
     : m_encoding(e)
     , m_defaultencoding(e)
+    , m_fallbackencoding(DEFAULT_ENCODING)
     , m_offset(0)
     , m_posInFile(0)
     , m_posInBuffer(0)
@@ -128,6 +129,11 @@ void CTextFile::SetEncoding(enc e)
     m_encoding = e;
 }
 
+void CTextFile::SetFallbackEncoding(enc e)
+{
+    m_fallbackencoding = e;
+}
+
 CTextFile::enc CTextFile::GetEncoding()
 {
     return m_encoding;
@@ -410,9 +416,8 @@ BOOL CTextFile::ReadString(CStringA& str)
                     }
                 }
             } else {
-                TRACE(_T("Fallback to ANSI encoding\n"));
                 // Switch to text and read again
-                m_encoding = ANSI;
+                m_encoding = m_fallbackencoding;
                 // Stop using the buffer
                 m_posInBuffer = m_nInBuffer = 0;
 
@@ -629,9 +634,8 @@ BOOL CTextFile::ReadString(CStringW& str)
                     }
                 }
             } else {
-                TRACE(_T("Fallback to ANSI encoding\n"));
                 // Switch to text and read again
-                m_encoding = ANSI;
+                m_encoding = m_fallbackencoding;
                 // Stop using the buffer
                 m_posInBuffer = m_nInBuffer = 0;
 

diff --git a/src/Subtitles/TextFile.h b/src/Subtitles/TextFile.h
@@ -35,7 +35,7 @@ class CTextFile : protected CStdioFile64
     };
 
 private:
-    enc m_encoding, m_defaultencoding;
+    enc m_encoding, m_defaultencoding, m_fallbackencoding;
     int m_offset;
     ULONGLONG m_posInFile;
     CAutoVectorPtr<char> m_buffer;
@@ -49,6 +49,7 @@ class CTextFile : protected CStdioFile64
     virtual bool Save(LPCTSTR lpszFileName, enc e /*= DEFAULT_ENCODING*/);
 
     void SetEncoding(enc e);
+    void SetFallbackEncoding(enc e);
     enc GetEncoding();
     bool IsUnicode();
 

diff --git a/src/mpc-hc/MainFrm.cpp b/src/mpc-hc/MainFrm.cpp
@@ -12411,6 +12411,7 @@ void CMainFrame::SetupCueChapters(CString fn) {
     CPlaylistItem* pli = m_wndPlaylistBar.GetCur();
 
     CWebTextFile f(CTextFile::UTF8);
+    f.SetFallbackEncoding(CTextFile::ANSI);
     if (!f.Open(fn) || !f.ReadString(str)) {
         return;
     }

diff --git a/src/mpc-hc/PlayerPlaylistBar.cpp b/src/mpc-hc/PlayerPlaylistBar.cpp
@@ -421,6 +421,7 @@ bool CPlayerPlaylistBar::ParseCUESheet(CString fn) {
     int cue_index(0);
 
     CWebTextFile f(CTextFile::UTF8);
+    f.SetFallbackEncoding(CTextFile::ANSI);
     if (!f.Open(fn) || !f.ReadString(str)) {
         return false;
     }
@@ -576,6 +577,7 @@ bool CPlayerPlaylistBar::ParseM3UPlayList(CString fn) {
     std::vector<int> idx;
 
     CWebTextFile f(CTextFile::UTF8);
+    f.SetFallbackEncoding(CTextFile::ANSI);
     if (!f.Open(fn) || !f.ReadString(str)) {
         return false;
     }
@@ -675,6 +677,7 @@ bool CPlayerPlaylistBar::ParseMPCPlayList(CString fn)
     std::vector<int> idx;
 
     CWebTextFile f(CTextFile::UTF8);
+    f.SetFallbackEncoding(CTextFile::ANSI);
     if (!f.Open(fn) || !f.ReadString(str) || str != _T("MPCPLAYLIST")) {
         return false;
     }