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

Merge these.

Browse Source
This commit is contained in:
Steve Checkoway
2007-02-14 10:26:30 +00:00
parent 68cc42acc8
commit 11eec4b0f8
2 changed files with 20 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/NotesLoaderDWI.cpp
+20 -24
View File
@@ -357,8 +357,27 @@ static float ParseBrokenDWITimestamp(const RString &arg1, const RString &arg2, c
return HHMMSSToSeconds( arg1+":"+arg2+":"+arg3 );
}
bool DWILoader::LoadFromDWIFile( const RString &sPath, Song &out )
void DWILoader::GetApplicableFiles( const RString &sPath, vector<RString> &out )
{
GetDirListing( sPath + RString("*.dwi"), out );
}
bool DWILoader::LoadFromDir( const RString &sPath_, Song &out )
{
vector<RString> aFileNames;
GetApplicableFiles( sPath_, aFileNames );
if( aFileNames.size() > 1 )
{
LOG->UserLog( "Song", sPath_, "has more than one DWI file. There should be only one!" );
return false;
}
/* We should have exactly one; if we had none, we shouldn't have been called to begin with. */
ASSERT( aFileNames.size() == 1 );
const RString sPath = sPath_ + aFileNames[0];
LOG->Trace( "Song::LoadFromDWIFile(%s)", sPath.c_str() );
MsdFile msd;
@@ -553,29 +572,6 @@ bool DWILoader::LoadFromDWIFile( const RString &sPath, Song &out )
return true;
}
void DWILoader::GetApplicableFiles( const RString &sPath, vector<RString> &out )
{
GetDirListing( sPath + RString("*.dwi"), out );
}
bool DWILoader::LoadFromDir( const RString &sPath, Song &out )
{
vector<RString> aFileNames;
GetApplicableFiles( sPath, aFileNames );
if( aFileNames.size() > 1 )
{
LOG->UserLog( "Song", sPath, "has more than one DWI file. There should be only one!" );
return false;
}
/* We should have exactly one; if we had none, we shouldn't have been
* called to begin with. */
ASSERT( aFileNames.size() == 1 );
return LoadFromDWIFile( sPath + aFileNames[0], out );
}
/*
* (c) 2001-2004 Chris Danford, Glenn Maynard
* All rights reserved.
stepmania/src/NotesLoaderDWI.h
-1
View File
@@ -10,7 +10,6 @@ class Song;
class DWILoader: public NotesLoader
{
bool LoadFromDWIFile( const RString &sPath, Song &out );
public:
static void GetApplicableFiles( const RString &sPath, vector<RString> &out );
bool LoadFromDir( const RString &sPath, Song &out );