Intermediate commit

git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@725 10f7b99b-c216-0410-bff0-8a66a9350fd8

1 files changed, 4 insertions, 10 deletions

diff --git a/src/subtitles/RenderedHdmvSubtitle.cpp b/src/subtitles/RenderedHdmvSubtitle.cpp
index 93ef3b929..1c8be0c09 100644
--- a/src/subtitles/RenderedHdmvSubtitle.cpp
+++ b/src/subtitles/RenderedHdmvSubtitle.cpp
@@ -51,7 +51,7 @@ STDMETHODIMP CRenderedHdmvSubtitle::NonDelegatingQueryInterface(REFIID riid, voi
 STDMETHODIMP_(POSITION) CRenderedHdmvSubtitle::GetStartPosition(REFERENCE_TIME rt, double fps)

 {

 	CAutoLock cAutoLock(&m_csCritSec);

-	return	m_HdmvSub.GetStartPosition(rt, fps);

+	return	m_HdmvSub.GetStartPosition(rt - m_rtStart, fps);

 }

 

 STDMETHODIMP_(POSITION) CRenderedHdmvSubtitle::GetNext(POSITION pos)

@@ -83,23 +83,17 @@ STDMETHODIMP_(bool) CRenderedHdmvSubtitle::IsAnimated(POSITION pos)
 STDMETHODIMP CRenderedHdmvSubtitle::Render(SubPicDesc& spd, REFERENCE_TIME rt, double fps, RECT& bbox)

 {

 	CAutoLock cAutoLock(&m_csCritSec);

-	m_HdmvSub.Render (spd, bbox);

+	m_HdmvSub.Render (spd, rt - m_rtStart, bbox);

 

 	return S_OK;

 }

 

-STDMETHODIMP CRenderedHdmvSubtitle::GetTextureSize (SIZE& TextureSize, SIZE& VideoSize, POINT& VideoTopLeft)

+STDMETHODIMP CRenderedHdmvSubtitle::GetTextureSize (POSITION pos, SIZE& MaxTextureSize, SIZE& VideoSize, POINT& VideoTopLeft)

 { 

 	CAutoLock cAutoLock(&m_csCritSec);

-	return m_HdmvSub.GetTextureSize(TextureSize, VideoSize, VideoTopLeft); 

+	return m_HdmvSub.GetTextureSize(pos, MaxTextureSize, VideoSize, VideoTopLeft); 

 };

 

-STDMETHODIMP CRenderedHdmvSubtitle::SetSubPic (ISubPic* pSubPic)

-{

-	CAutoLock cAutoLock(&m_csCritSec);

-	return m_HdmvSub.SetSubPic(pSubPic); 

-}

-

 // IPersist

 

 STDMETHODIMP CRenderedHdmvSubtitle::GetClassID(CLSID* pClassID)