diff options
author | Casimir666 <casimir666@users.sourceforge.net> | 2009-04-18 21:39:19 +0400 |
---|---|---|
committer | Casimir666 <casimir666@users.sourceforge.net> | 2009-04-18 21:39:19 +0400 |
commit | 530c6354edabdd19d45d883fee88793664170adf (patch) | |
tree | d1fcf2a4b371465f0c20201a52f33db6367688e7 /src/subtitles/STS.cpp | |
parent | f39d30c0b2eba6db09f1d3f66be6fd1eb2d7f5a5 (diff) |
Changed : merge with Beliyaal branch
Added : support for madVR (new Video Renderer)
git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@1048 10f7b99b-c216-0410-bff0-8a66a9350fd8
Diffstat (limited to 'src/subtitles/STS.cpp')
-rw-r--r-- | src/subtitles/STS.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/subtitles/STS.cpp b/src/subtitles/STS.cpp index 01ab71e3e..c3efe9380 100644 --- a/src/subtitles/STS.cpp +++ b/src/subtitles/STS.cpp @@ -668,7 +668,7 @@ static bool OpenSubViewer(CTextFile* file, CSimpleTextSubtitle& ret, int CharSet static STSStyle* GetMicroDVDStyle(CString str, int CharSet)
{
- STSStyle* ret = new STSStyle();
+ STSStyle* ret = DNew STSStyle();
if(!ret) return(NULL);
for(int i = 0, len = str.GetLength(); i < len; i++)
@@ -1275,7 +1275,7 @@ static bool LoadFont(CString& font) if(!CFileGetStatus(fn, fs))
{
CFile f;
- if(f.Open(fn, CFile::modeCreate|CFile::modeWrite|CFile::typeBinary|CFile::shareDenyWrite))
+ if(f.Open(fn, CFile::modeCreate|CFile::modeWrite|CFile::typeBinary|CFile::shareDenyNone))
{
f.Write(pData, datalen);
f.Close();
@@ -1395,7 +1395,7 @@ static bool OpenSubStationAlpha(CTextFile* file, CSimpleTextSubtitle& ret, int C }
else if(entry == L"style")
{
- STSStyle* style = new STSStyle;
+ STSStyle* style = DNew STSStyle;
if(!style) return(false);
try
@@ -1563,7 +1563,7 @@ static bool OpenXombieSub(CTextFile* file, CSimpleTextSubtitle& ret, int CharSet }
else if(entry == L"style")
{
- STSStyle* style = new STSStyle;
+ STSStyle* style = DNew STSStyle;
if(!style) return(false);
try
@@ -1867,7 +1867,7 @@ bool CSimpleTextSubtitle::CopyStyles(const CSTSStyleMap& styles, bool fAppend) STSStyle* val;
styles.GetNextAssoc(pos, key, val);
- STSStyle* s = new STSStyle;
+ STSStyle* s = DNew STSStyle;
if(!s) return(false);
*s = *val;
@@ -2046,7 +2046,7 @@ STSStyle* CSimpleTextSubtitle::CreateDefaultStyle(int CharSet) if(!m_styles.Lookup(def, ret))
{
- STSStyle* style = new STSStyle();
+ STSStyle* style = DNew STSStyle();
style->charSet = CharSet;
AddStyle(def, style);
m_styles.Lookup(def, ret);
|