diff --git a/stepmania/src/RageMovieTexture.cpp b/stepmania/src/RageMovieTexture.cpp index 5711b2c612..7d585bdcce 100644 --- a/stepmania/src/RageMovieTexture.cpp +++ b/stepmania/src/RageMovieTexture.cpp @@ -321,7 +321,12 @@ RageMovieTexture::RageMovieTexture( RageMovieTexture::~RageMovieTexture() { LOG->Trace("RageMovieTexture::~RageMovieTexture"); - CleanupDShow(); + + // Shut down the graph + if (m_pGB) { + Stop(); + m_pGB.Release (); + } SAFE_RELEASE(m_pd3dTexture[0]); SAFE_RELEASE(m_pd3dTexture[1]); @@ -537,20 +542,6 @@ void RageMovieTexture::CheckMovieStatus() SetPosition(0); } - -//----------------------------------------------------------------------------- -// CleanupDShow -//----------------------------------------------------------------------------- -void RageMovieTexture::CleanupDShow() -{ - LOG->Trace("RageMovieTexture::CleanupDShow()"); - // Shut down the graph - if (m_pGB) { - Stop(); - m_pGB.Release (); - } -} - void RageMovieTexture::Play() { PlayMovie(); diff --git a/stepmania/src/RageMovieTexture.h b/stepmania/src/RageMovieTexture.h index e0de08149e..e7c63acc41 100644 --- a/stepmania/src/RageMovieTexture.h +++ b/stepmania/src/RageMovieTexture.h @@ -67,7 +67,6 @@ protected: virtual HRESULT InitDShowTextureRenderer(); virtual HRESULT PlayMovie(); virtual void CheckMovieStatus(); - virtual void CleanupDShow(); //----------------------------------------------------------------------------- // DirectShow pointers