From 035c89ae145fa75d02670eac051ea2c2233dd97b Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Thu, 20 Feb 2003 03:35:37 +0000 Subject: [PATCH] add RageMovieTexture abstraction remove "#ifdef LINUX" hacks --- stepmania/src/RageTextureManager.cpp | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/stepmania/src/RageTextureManager.cpp b/stepmania/src/RageTextureManager.cpp index e963d6deab..f17cc4c893 100644 --- a/stepmania/src/RageTextureManager.cpp +++ b/stepmania/src/RageTextureManager.cpp @@ -16,9 +16,7 @@ //----------------------------------------------------------------------------- #include "RageTextureManager.h" #include "RageBitmapTexture.h" -#if !defined(LINUX) -# include "RageMovieTexture.h" -#endif +#include "arch/MovieTexture/MovieTexture.h" #include "RageUtil.h" #include "RageLog.h" #include "RageException.h" @@ -90,14 +88,10 @@ RageTexture* RageTextureManager::LoadTexture( RageTextureID ID ) splitpath( ID.filename, sDir, sFName, sExt ); RageTexture* pTexture; -#ifndef LINUX if( sExt == ".avi" || sExt == ".mpg" || sExt == ".mpeg" ) - pTexture = new RageMovieTexture( ID ); + pTexture = MakeRageMovieTexture( ID ); else pTexture = new RageBitmapTexture( ID ); -#else - pTexture = new RageBitmapTexture(ID); -#endif // LOG->Trace( "RageTextureManager: Loaded '%s'.", ID.filename.GetString() ); @@ -164,7 +158,6 @@ void RageTextureManager::UnloadTexture( RageTextureID ID ) if(p == m_mapPathToTexture.end()) RageException::Throw( "Tried to Unload texture '%s' that wasn't loaded.", ID.filename.GetString() ); - RageTexture* pTexture = p->second; UnloadTexture(p->second); //LOG->Trace( "RageTextureManager: '%s' will not be deleted. It still has %d references.", sTexturePath.GetString(), pTexture->m_iRefCount ); }