From 9196c695774a51382e9cda4ad41e4fa91ac6af9b Mon Sep 17 00:00:00 2001 From: Jason Felds Date: Sat, 14 May 2011 17:34:22 -0400 Subject: [PATCH] [splittiming] Temp breakage for parsing. Going to do this the SSC way, because that's how we roll. --- src/NotesLoaderSMA.h | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/NotesLoaderSMA.h b/src/NotesLoaderSMA.h index 0fceb3977d..94d6ae9dbb 100644 --- a/src/NotesLoaderSMA.h +++ b/src/NotesLoaderSMA.h @@ -9,6 +9,16 @@ class Song; class Steps; class TimingData; +/** + * @brief The various states while parsing a .sma file. + */ +enum SMALoadingStates +{ + SMA_GETTING_SONG_INFO, /**< Retrieving song information. */ + SMA_GETTING_STEP_INFO, /**< Retrieving step information. */ + NUM_SMALoadingStates /**< The number of states used. */ +}; + /** @brief Reads a Song from a .SMA file. */ namespace SMALoader { @@ -25,8 +35,7 @@ namespace SMALoader bool LoadFromSMAFile( const RString &sPath, Song &out ); void GetApplicableFiles( const RString &sPath, vector &out ); - bool LoadTimingFromFile( const RString &fn, TimingData &out ); - void LoadTimingFromSMAFile( const MsdFile &msd, TimingData &out ); + bool LoadEditFromFile( RString sEditFilePath, ProfileSlot slot, bool bAddStepsToSong ); bool LoadEditFromBuffer( const RString &sBuffer, const RString &sEditFilePath, ProfileSlot slot ); bool LoadEditFromMsd( const MsdFile &msd, const RString &sEditFilePath, ProfileSlot slot, bool bAddStepsToSong );