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

Fix multisyllabic words spanning measures (Tracker #2001806)

Browse Source
This commit is contained in:
Matthias Neeracher 2011-08-26 19:06:06 +00:00
parent c26552f054
commit fc36ebc79c
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Sources/VLPListDocument.mm
View File

@ -5,7 +5,7 @@
// //
// (MN) Matthias Neeracher // (MN) Matthias Neeracher
// //
// Copyright © 2007 Matthias Neeracher // Copyright © 2007-2011 Matthias Neeracher
// //
#import "VLPListDocument.h" #import "VLPListDocument.h"
@ -228,14 +228,12 @@ enum {
kPotentialSwing16th kPotentialSwing16th
}; };
- (void)readMelody:(NSArray *)melody inMeasure:(size_t)measNo onsets:(int *)onsets - (void)readMelody:(NSArray *)melody inMeasure:(size_t)measNo onsets:(int *)onsets lyrics:(uint8_t *)prevKind
{ {
VLFraction at(0); VLFraction at(0);
int lastOnset = 0; int lastOnset = 0;
VLFraction tiedStart(0); VLFraction tiedStart(0);
VLLyricsNote tiedNote; VLLyricsNote tiedNote;
uint8_t prevKind[20];
memset(prevKind, 0, 20);
for (NSEnumerator * ne = [melody objectEnumerator]; for (NSEnumerator * ne = [melody objectEnumerator];
NSDictionary * ndict = [ne nextObject]; NSDictionary * ndict = [ne nextObject];
@ -349,6 +347,8 @@ advanceAt:
size_t measNo = 0; size_t measNo = 0;
int onsets[14] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; int onsets[14] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
uint8_t lyricsKind[20];
memset(lyricsKind, 0, 20*sizeof(lyricsKind[0]));
for (NSEnumerator * me = [measures objectEnumerator]; for (NSEnumerator * me = [measures objectEnumerator];
NSDictionary * mdict = [me nextObject]; NSDictionary * mdict = [me nextObject];
++measNo ++measNo
@ -358,7 +358,7 @@ advanceAt:
if (NSNumber * mPx = [mdict objectForKey:@"properties"]) if (NSNumber * mPx = [mdict objectForKey:@"properties"])
song->SetProperties(measNo, [mPx intValue]); song->SetProperties(measNo, [mPx intValue]);
[self readMelody:[mdict objectForKey:@"melody"] inMeasure:measNo onsets:onsets]; [self readMelody:[mdict objectForKey:@"melody"] inMeasure:measNo onsets:onsets lyrics:&lyricsKind[0]];
[self readChords:[mdict objectForKey:@"chords"] inMeasure:measNo]; [self readChords:[mdict objectForKey:@"chords"] inMeasure:measNo];
if ([[mdict objectForKey:@"tocoda"] boolValue]) if ([[mdict objectForKey:@"tocoda"] boolValue])