diff --git a/src/NotesLoaderJson.cpp b/src/NotesLoaderJson.cpp index 147f4514c6..445ec41ee0 100644 --- a/src/NotesLoaderJson.cpp +++ b/src/NotesLoaderJson.cpp @@ -18,7 +18,7 @@ void NotesLoaderJson::GetApplicableFiles( const RString &sPath, vector static void Deserialize(TimingSegment &seg_, const Json::Value &root) { TimingSegment *seg = &seg_; - + float fBeat = root["Beat"].asDouble(); seg->SetBeat(fBeat); switch (seg->GetType()) @@ -203,7 +203,6 @@ static void Deserialize( Song &out, const Json::Value &root ) FOREACH( Steps*, vpSteps, iter ) out.AddSteps( *iter ); } - } bool NotesLoaderJson::LoadFromJsonFile( const RString &sPath, Song &out ) diff --git a/src/NotesLoaderPMS.cpp b/src/NotesLoaderPMS.cpp index 2c375ed5c7..1b74ea3808 100644 --- a/src/NotesLoaderPMS.cpp +++ b/src/NotesLoaderPMS.cpp @@ -13,6 +13,8 @@ #include "NoteTypes.h" #include "NotesLoader.h" +// XXX: this is mostly a copy of NotesLoaderBMS and should be consolidated there. -aj + typedef multimap NameToData_t; typedef map MeasureToTimeSig_t;