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

New branch: [notesloader]

Browse Source 
Time to better unify our files and refactor properly.
This commit is contained in:
Jason Felds
2011-06-09 13:46:30 -04:00
parent 0fa0d42549
commit b6bf776716
12 changed files with 53 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/NotesLoader.cpp
+10 -7
View File
@@ -32,20 +32,23 @@ bool NotesLoader::LoadFromDir( const RString &sPath, Song &out, set<RString> &Bl
vector<RString> list;
BlacklistedImages.clear();
SSCLoader::GetApplicableFiles( sPath, list );
SSCLoader loaderSSC;
loaderSSC.GetApplicableFiles( sPath, list );
if( !list.empty() )
{
if( !SSCLoader::LoadFromDir( sPath, out ) )
if( !loaderSSC.LoadFromDir( sPath, out ) )
return false;
SSCLoader::TidyUpData( out, false );
loaderSSC.TidyUpData( out, false );
return true;
}
SMALoader::GetApplicableFiles( sPath, list );
SMALoader loaderSMA;
loaderSMA.GetApplicableFiles( sPath, list );
if (!list.empty() )
return SMALoader::LoadFromDir( sPath, out );
SMLoader::GetApplicableFiles( sPath, list );
return loaderSMA.LoadFromDir( sPath, out );
SMLoader loaderSM;
loaderSM.GetApplicableFiles( sPath, list );
if (!list.empty() )
return SMLoader::LoadFromDir( sPath, out );
return loaderSM.LoadFromDir( sPath, out );
DWILoader::GetApplicableFiles( sPath, list );
if( !list.empty() )
return DWILoader::LoadFromDir( sPath, out, BlacklistedImages );