microtherion/VocalEasel
1
0
Fork 0
mirror of https://github.com/microtherion/VocalEasel.git synced 2024-12-22 19:23:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix adding measures, loading rests

Browse Source
This commit is contained in:
Matthias Neeracher 2007-01-12 09:02:57 +00:00
parent 44f4f86173
commit 548c129d15
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Sources/VLXMLDocument.mm
View File

@ -569,8 +569,17 @@ int8_t sStepToPitch[] = {
int m = [[[measure attributeForName:@"number"] int m = [[[measure attributeForName:@"number"]
stringValue] intValue]-1; stringValue] intValue]-1;
if (m >= song->CountMeasures()) if (m >= song->CountMeasures()) {
song->fMeasures.resize(m); size_t oldSz = song->fMeasures.size();
song->fMeasures.resize(m+1);
VLLyricsNote rest = VLLyricsNote(VLRest(prop.fTime));
VLChord rchord;
rchord.fDuration = prop.fTime;
for (size_t i=oldSz; i<=m; ++i) {
song->fMeasures[i].fChords.push_back(rchord);
song->fMeasures[i].fMelody.push_back(rest);
}
}
[self readBarlines:[measure elementsForName:@"barline"] measure:m [self readBarlines:[measure elementsForName:@"barline"] measure:m
repeat:&repeat inRepeat:&inRepeat error:outError]; repeat:&repeat inRepeat:&inRepeat error:outError];
@ -579,7 +588,6 @@ int8_t sStepToPitch[] = {
for (NSXMLElement * note; note = [n nextObject]; ) { for (NSXMLElement * note; note = [n nextObject]; ) {
VLLyricsNote n = [self readNote:note withUnit:unit]; VLLyricsNote n = [self readNote:note withUnit:unit];
if (n.fPitch != VLNote::kNoPitch)
song->AddNote(n, m, at); song->AddNote(n, m, at);
at += n.fDuration; at += n.fDuration;
} }