From a6573c2870a49085fba1dcd03fd367001d5316e3 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Wed, 7 Jan 2004 04:08:23 +0000 Subject: [PATCH] move stuff --- .../arch/MovieTexture/MovieTexture_FFMpeg.cpp | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/stepmania/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp b/stepmania/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp index 8c435ce45f..db8e38e69e 100644 --- a/stepmania/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp +++ b/stepmania/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp @@ -415,6 +415,18 @@ MovieTexture_FFMpeg::MovieTexture_FFMpeg( RageTextureID ID ): Play(); } +MovieTexture_FFMpeg::~MovieTexture_FFMpeg() +{ + StopThread(); + DestroyDecoder(); + DestroyTexture(); + + delete decoder; + + SDL_DestroySemaphore( m_BufferFinished ); +} + + static CString averr_ssprintf( int err, const char *fmt, ... ) { ASSERT( err < 0 ); @@ -796,17 +808,6 @@ void MovieTexture_FFMpeg::DecoderThread() CHECKPOINT; } -MovieTexture_FFMpeg::~MovieTexture_FFMpeg() -{ - StopThread(); - DestroyDecoder(); - DestroyTexture(); - - delete decoder; - - SDL_DestroySemaphore( m_BufferFinished ); -} - void MovieTexture_FFMpeg::Update(float fDeltaTime) { /* Note that if there's an image waiting, we *must* signal m_BufferFinished, or