diff --git a/src/NotesLoaderSM.cpp b/src/NotesLoaderSM.cpp index 5e5ae1292a..35562c1efd 100644 --- a/src/NotesLoaderSM.cpp +++ b/src/NotesLoaderSM.cpp @@ -956,7 +956,7 @@ bool SMLoader::LoadEditFromMsd( const MsdFile &msd, const RString &sEditFilePath void SMLoader::GetApplicableFiles( const RString &sPath, vector &out ) { - GetDirListing( sPath + RString("*.sm"), out ); + GetDirListing( sPath + RString("*" + this->GetFileExtension() ), out ); } void SMLoader::TidyUpData( Song &song, bool bFromCache ) diff --git a/src/NotesLoaderSMA.cpp b/src/NotesLoaderSMA.cpp index 930f718ec6..44f6f5026f 100644 --- a/src/NotesLoaderSMA.cpp +++ b/src/NotesLoaderSMA.cpp @@ -438,11 +438,6 @@ bool SMALoader::LoadFromSimfile( const RString &sPath, Song &out, bool bFromCach return true; } -void SMALoader::GetApplicableFiles( const RString &sPath, vector &out ) -{ - GetDirListing( sPath + RString("*.sma"), out ); -} - /** * @file * @author Aldo Fregoso, Jason Felds (c) 2009-2011 diff --git a/src/NotesLoaderSMA.h b/src/NotesLoaderSMA.h index ecebd82676..f38acac470 100644 --- a/src/NotesLoaderSMA.h +++ b/src/NotesLoaderSMA.h @@ -26,12 +26,7 @@ struct SMALoader : public SMLoader SMALoader() : SMLoader(".sma") {} virtual bool LoadFromSimfile( const RString &sPath, Song &out, bool bFromCache = false ); - /** - * @brief Retrieve the list of .sma files. - * @param sPath a const reference to the path on the hard drive to check. - * @param out a vector of files found in the path. - */ - virtual void GetApplicableFiles( const RString &sPath, vector &out ); + void ProcessBeatsPerMeasure( TimingData &out, const RString sParam ); void ProcessMultipliers( TimingData &out, const int iRowsPerBeat, const RString sParam ); diff --git a/src/NotesLoaderSSC.cpp b/src/NotesLoaderSSC.cpp index 6c32cc6c9e..3c13899ff7 100644 --- a/src/NotesLoaderSSC.cpp +++ b/src/NotesLoaderSSC.cpp @@ -557,11 +557,6 @@ bool SSCLoader::LoadFromSimfile( const RString &sPath, Song &out, bool bFromCach return true; } -void SSCLoader::GetApplicableFiles( const RString &sPath, vector &out ) -{ - GetDirListing( sPath + RString("*.ssc"), out ); -} - bool SSCLoader::LoadEditFromFile( RString sEditFilePath, ProfileSlot slot, bool bAddStepsToSong ) { LOG->Trace( "SSCLoader::LoadEditFromFile(%s)", sEditFilePath.c_str() ); diff --git a/src/NotesLoaderSSC.h b/src/NotesLoaderSSC.h index fc6332f731..3031932841 100644 --- a/src/NotesLoaderSSC.h +++ b/src/NotesLoaderSSC.h @@ -42,12 +42,7 @@ struct SSCLoader : public SMLoader * @return its success or failure. */ virtual bool LoadFromSimfile( const RString &sPath, Song &out, bool bFromCache = false ); - /** - * @brief Retrieve the list of .ssc files. - * @param sPath a const reference to the path on the hard drive to check. - * @param out a vector of files found in the path. - */ - virtual void GetApplicableFiles( const RString &sPath, vector &out ); + /** * @brief Attempt to load an edit from the hard drive. * @param sEditFilePath a path on the hard drive to check.