diff options
author | Casimir666 <casimir666@users.sourceforge.net> | 2006-12-10 15:47:28 +0300 |
---|---|---|
committer | Casimir666 <casimir666@users.sourceforge.net> | 2006-12-10 15:47:28 +0300 |
commit | f7d6f32d16de3c2da0569b77f0616b99f0a7b301 (patch) | |
tree | 6eeb9c2ceae331c3f5b745af8314caadfcec0ce6 /src/subtitles/STS.cpp | |
parent | ea6b4a18507a1f287198b963077c2b20991d10fc (diff) |
git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@26 10f7b99b-c216-0410-bff0-8a66a9350fd8
Diffstat (limited to 'src/subtitles/STS.cpp')
-rw-r--r-- | src/subtitles/STS.cpp | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/src/subtitles/STS.cpp b/src/subtitles/STS.cpp index ec6f4aa3f..54fad6e58 100644 --- a/src/subtitles/STS.cpp +++ b/src/subtitles/STS.cpp @@ -448,6 +448,7 @@ static CStringW MBCSSSAToUnicode(CStringW str, int CharSet) CStringW RemoveSSATags(CStringW str, bool fUnicode, int CharSet)
{
str.Replace (L"{\\i1}", L"<i>"); // Casimir666 : tag <i> supported in SRT files!
+ str.Replace (L"{\\i}", L"</i>");
for(int i = 0, j; i < str.GetLength(); )
{
@@ -1719,20 +1720,20 @@ static bool OpenMPL2(CTextFile* file, CSimpleTextSubtitle& ret, int CharSet) typedef bool (*STSOpenFunct)(CTextFile* file, CSimpleTextSubtitle& ret, int CharSet);
-typedef struct {STSOpenFunct open; tmode mode;} OpenFunctStruct;
+typedef struct {STSOpenFunct open; tmode mode; exttype type; } OpenFunctStruct;
static OpenFunctStruct OpenFuncts[] =
{
- OpenSubRipper, TIME,
- OpenOldSubRipper, TIME,
- OpenSubViewer, TIME,
- OpenMicroDVD, FRAME,
- OpenSami, TIME,
- OpenVPlayer, TIME,
- OpenSubStationAlpha, TIME,
- OpenXombieSub, TIME,
- OpenUSF, TIME,
- OpenMPL2, TIME,
+ OpenSubRipper, TIME, EXTSRT,
+ OpenOldSubRipper, TIME, EXTSRT,
+ OpenSubViewer, TIME, EXTSUB,
+ OpenMicroDVD, FRAME, EXTSSA,
+ OpenSami, TIME, EXTSMI,
+ OpenVPlayer, TIME, EXTSRT,
+ OpenSubStationAlpha, TIME, EXTSSA,
+ OpenXombieSub, TIME, EXTXSS,
+ OpenUSF, TIME, EXTUSF,
+ OpenMPL2, TIME, EXTSRT,
};
static int nOpenFuncts = countof(OpenFuncts);
@@ -1785,6 +1786,8 @@ void CSimpleTextSubtitle::Copy(CSimpleTextSubtitle& sts) m_name = sts.m_name;
m_mode = sts.m_mode;
+ m_path = sts.m_path;
+ m_exttype = sts.m_exttype;
m_dstScreenSize = sts.m_dstScreenSize;
m_defaultWrapStyle = sts.m_defaultWrapStyle;
m_collisions = sts.m_collisions;
@@ -2569,6 +2572,7 @@ bool CSimpleTextSubtitle::Open(CTextFile* f, int CharSet, CString name) }
m_name = name;
+ m_exttype = OpenFuncts[i].type;
m_mode = OpenFuncts[i].mode;
m_encoding = f->GetEncoding();
m_path = f->GetFilePath();
|