CleanupDShow is tiny and only used in dtor, so get rid of it

This commit is contained in:
Glenn Maynard
2002-10-13 22:57:27 +00:00
parent b7ff70a24c
commit 0b291313da
2 changed files with 6 additions and 16 deletions
+6 -15
View File
@@ -321,7 +321,12 @@ RageMovieTexture::RageMovieTexture(
RageMovieTexture::~RageMovieTexture() RageMovieTexture::~RageMovieTexture()
{ {
LOG->Trace("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[0]);
SAFE_RELEASE(m_pd3dTexture[1]); SAFE_RELEASE(m_pd3dTexture[1]);
@@ -537,20 +542,6 @@ void RageMovieTexture::CheckMovieStatus()
SetPosition(0); SetPosition(0);
} }
//-----------------------------------------------------------------------------
// CleanupDShow
//-----------------------------------------------------------------------------
void RageMovieTexture::CleanupDShow()
{
LOG->Trace("RageMovieTexture::CleanupDShow()");
// Shut down the graph
if (m_pGB) {
Stop();
m_pGB.Release ();
}
}
void RageMovieTexture::Play() void RageMovieTexture::Play()
{ {
PlayMovie(); PlayMovie();
-1
View File
@@ -67,7 +67,6 @@ protected:
virtual HRESULT InitDShowTextureRenderer(); virtual HRESULT InitDShowTextureRenderer();
virtual HRESULT PlayMovie(); virtual HRESULT PlayMovie();
virtual void CheckMovieStatus(); virtual void CheckMovieStatus();
virtual void CleanupDShow();
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// DirectShow pointers // DirectShow pointers