actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

add RageMovieTexture abstraction

Browse Source 
remove "#ifdef LINUX" hacks
This commit is contained in:
Glenn Maynard
2003-02-20 03:35:37 +00:00
parent c457452a49
commit 035c89ae14
1 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/RageTextureManager.cpp
+2 -9
View File
@@ -16,9 +16,7 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#include "RageTextureManager.h" #include "RageTextureManager.h"
#include "RageBitmapTexture.h" #include "RageBitmapTexture.h"
#if !defined(LINUX) #include "arch/MovieTexture/MovieTexture.h"
# include "RageMovieTexture.h"
#endif
#include "RageUtil.h" #include "RageUtil.h"
#include "RageLog.h" #include "RageLog.h"
#include "RageException.h" #include "RageException.h"
@@ -90,14 +88,10 @@ RageTexture* RageTextureManager::LoadTexture( RageTextureID ID )
splitpath( ID.filename, sDir, sFName, sExt ); splitpath( ID.filename, sDir, sFName, sExt );
RageTexture* pTexture; RageTexture* pTexture;
#ifndef LINUX
if( sExt == ".avi" || sExt == ".mpg" || sExt == ".mpeg" ) if( sExt == ".avi" || sExt == ".mpg" || sExt == ".mpeg" )
pTexture = new RageMovieTexture( ID ); pTexture = MakeRageMovieTexture( ID );
else else
pTexture = new RageBitmapTexture( ID ); pTexture = new RageBitmapTexture( ID );
#else
pTexture = new RageBitmapTexture(ID);
#endif
// LOG->Trace( "RageTextureManager: Loaded '%s'.", ID.filename.GetString() ); // LOG->Trace( "RageTextureManager: Loaded '%s'.", ID.filename.GetString() );
@@ -164,7 +158,6 @@ void RageTextureManager::UnloadTexture( RageTextureID ID )
if(p == m_mapPathToTexture.end()) if(p == m_mapPathToTexture.end())
RageException::Throw( "Tried to Unload texture '%s' that wasn't loaded.", ID.filename.GetString() ); RageException::Throw( "Tried to Unload texture '%s' that wasn't loaded.", ID.filename.GetString() );
RageTexture* pTexture = p->second;
UnloadTexture(p->second); UnloadTexture(p->second);
//LOG->Trace( "RageTextureManager: '%s' will not be deleted. It still has %d references.", sTexturePath.GetString(), pTexture->m_iRefCount ); //LOG->Trace( "RageTextureManager: '%s' will not be deleted. It still has %d references.", sTexturePath.GetString(), pTexture->m_iRefCount );
} }