diff --git a/stepmania/src/arch/MovieTexture/MovieTexture_DShow.cpp b/stepmania/src/arch/MovieTexture/MovieTexture_DShow.cpp index b617f57c54..3f303939ff 100644 --- a/stepmania/src/arch/MovieTexture/MovieTexture_DShow.cpp +++ b/stepmania/src/arch/MovieTexture/MovieTexture_DShow.cpp @@ -399,27 +399,13 @@ void MovieTexture_DShow::Pause() m_pGB.QueryInterface(&pMC); HRESULT hr; + /* Use Pause(), so we'll get a still frame in CTextureRenderer::OnReceiveFirstSample. */ if( FAILED( hr = pMC->Pause() ) ) RageException::Throw( hr_ssprintf(hr, "Could not pause the DirectShow graph.") ); StopSkippingUpdates(); } -void MovieTexture_DShow::Stop() -{ - SkipUpdates(); - - CComPtr pMC; - m_pGB.QueryInterface(&pMC); - - HRESULT hr; - if( FAILED( hr = pMC->Stop() ) ) - RageException::Throw( hr_ssprintf(hr, "Could not stop the DirectShow graph.") ); - - m_bPlaying = false; - - StopSkippingUpdates(); -} void MovieTexture_DShow::SetPosition( float fSeconds ) { diff --git a/stepmania/src/arch/MovieTexture/MovieTexture_DShow.h b/stepmania/src/arch/MovieTexture/MovieTexture_DShow.h index 0e608f802f..9871f1e9d1 100644 --- a/stepmania/src/arch/MovieTexture/MovieTexture_DShow.h +++ b/stepmania/src/arch/MovieTexture/MovieTexture_DShow.h @@ -55,7 +55,6 @@ public: virtual void Play(); virtual void Pause(); - virtual void Stop(); virtual void SetPosition( float fSeconds ); virtual void SetPlaybackRate( float fRate ); virtual bool IsPlaying() const { return m_bPlaying; }