It's hard to maintain this information when using begin() and end() so rather than wrapping the iterators, just check each time IsComposite() is called since it doesn't happen _that_ often. Just don't call IsComposite() often.

This commit is contained in:
Steve Checkoway
2006-06-26 09:33:11 +00:00
parent ec9d50c332
commit 8129d943ba
5 changed files with 15 additions and 11 deletions
+1 -3
View File
@@ -239,7 +239,7 @@ static void LoadFromSMNoteDataStringWithPlayer( NoteData& out, const RString &sS
}
void NoteDataUtil::LoadFromSMNoteDataString( NoteData &out, const RString &sSMNoteData_ )
void NoteDataUtil::LoadFromSMNoteDataString( NoteData &out, const RString &sSMNoteData_, bool bComposite )
{
//
// Load note data
@@ -263,10 +263,8 @@ void NoteDataUtil::LoadFromSMNoteDataString( NoteData &out, const RString &sSMNo
/* Clear notes, but keep the same number of tracks. */
int iNumTracks = out.GetNumTracks();
bool bComposite = out.IsComposite();
out.Init();
out.SetNumTracks( iNumTracks );
out.SetComposite( bComposite );
if( !bComposite )
{