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

Make GetApplicableFiles() static and don't create a loader unless it can load from that directory.

Browse Source
This commit is contained in:
Steve Checkoway
2006-11-01 10:09:13 +00:00
parent a9e04a845a
commit 5f851a47ca
6 changed files with 11 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/NotesLoader.cpp
+7 -26
View File
@@ -9,13 +9,6 @@
#include "NotesLoaderBMS.h"
#include "NotesLoaderKSF.h"
bool NotesLoader::Loadable( const RString &sPath )
{
vector<RString> list;
GetApplicableFiles( sPath, list );
return !list.empty();
}
void NotesLoader::GetMainAndSubTitlesFromFullTitle( const RString &sFullTitle, RString &sMainTitleOut, RString &sSubTitleOut )
{
const RString sLeftSeps[] = { "\t", " -", " ~", " (", " [" };
@@ -35,26 +28,14 @@ void NotesLoader::GetMainAndSubTitlesFromFullTitle( const RString &sFullTitle, R
NotesLoader *NotesLoader::MakeLoader( const RString &sDir )
{
NotesLoader *ret;
vector<RString> list;
/* Actually, none of these have any persistant data, so we
* could optimize this, but since they don't have any data,
* there's no real point ... */
ret = new SMLoader;
if(ret->Loadable( sDir )) return ret;
delete ret;
ret = new DWILoader;
if(ret->Loadable( sDir )) return ret;
delete ret;
ret = new BMSLoader;
if(ret->Loadable( sDir )) return ret;
delete ret;
ret = new KSFLoader;
if(ret->Loadable( sDir )) return ret;
delete ret;
#define CHECK_LOADER(x) x::GetApplicableFiles( sDir, list ); if( list.size() ) return new x
CHECK_LOADER( SMLoader );
CHECK_LOADER( DWILoader );
CHECK_LOADER( BMSLoader );
CHECK_LOADER( KSFLoader );
#undef CHECK_LOADER
return NULL;
}