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 reading of documents with multiple time values

Browse Source
This commit is contained in:
Matthias Neeracher 2008-01-26 10:53:24 +00:00
parent f9f2946bb8
commit b8dac8dd63
3 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Sources/VLModel.cpp
View File

@ -558,12 +558,32 @@ void VLSong::AddMeasure()
VLChord rchord(dur); VLChord rchord(dur);
VLMeasure meas; VLMeasure meas;
meas.fPropIdx = fProperties.size()-1;
meas.fChords.push_back(rchord); meas.fChords.push_back(rchord);
meas.fMelody.push_back(rest); meas.fMelody.push_back(rest);
fMeasures.push_back(meas); fMeasures.push_back(meas);
} }
void VLSong::SetProperties(size_t measure, int propIdx)
{
VLFraction dur = fProperties[propIdx].fTime;
dur.Normalize();
VLLyricsNote rest(dur);
VLChord rchord(dur);
VLMeasure meas;
meas.fPropIdx = propIdx;
meas.fChords.push_back(rchord);
meas.fMelody.push_back(rest);
if (measure < fMeasures.size())
fMeasures[measure] = meas;
else
while (fMeasures.size() <= measure)
fMeasures.push_back(meas);
}
void VLSong::swap(VLSong & other) void VLSong::swap(VLSong & other)
{ {
fProperties.swap(other.fProperties); fProperties.swap(other.fProperties);

1
Sources/VLModel.h
View File

@ -377,6 +377,7 @@ public:
const VLProperties & Properties(size_t measure) const { const VLProperties & Properties(size_t measure) const {
return fProperties[fMeasures[measure].fPropIdx]; return fProperties[fMeasures[measure].fPropIdx];
} }
void SetProperties(size_t measure, int propIdx);
bool DoesBeginSection(size_t measure) const; bool DoesBeginSection(size_t measure) const;
void AddSection(size_t measure); void AddSection(size_t measure);

5
Sources/VLPListDocument.mm
View File

@ -310,6 +310,8 @@ advanceAt:
) { ) {
if (NSNumber * mNo = [mdict objectForKey:@"measure"]) if (NSNumber * mNo = [mdict objectForKey:@"measure"])
measNo = static_cast<size_t>([mNo intValue]); measNo = static_cast<size_t>([mNo intValue]);
if (NSNumber * mPx = [mdict objectForKey:@"properties"])
song->SetProperties(measNo, [mPx intValue]);
[self readMelody:[mdict objectForKey:@"melody"] inMeasure:measNo onsets:onsets]; [self readMelody:[mdict objectForKey:@"melody"] inMeasure:measNo onsets:onsets];
[self readChords:[mdict objectForKey:@"chords"] inMeasure:measNo]; [self readChords:[mdict objectForKey:@"chords"] inMeasure:measNo];
@ -322,9 +324,6 @@ advanceAt:
song->fMeasures[measNo].fBreak |= VLMeasure::kNewSystem; song->fMeasures[measNo].fBreak |= VLMeasure::kNewSystem;
if ([[mdict objectForKey:@"new-page"] boolValue]) if ([[mdict objectForKey:@"new-page"] boolValue])
song->fMeasures[measNo].fBreak |= VLMeasure::kNewPage; song->fMeasures[measNo].fBreak |= VLMeasure::kNewPage;
if (NSNumber * mPx = [mdict objectForKey:@"properties"])
song->fMeasures[measNo].fPropIdx=
static_cast<size_t>([mPx intValue]);
if (NSDictionary * beginRep = [mdict objectForKey:@"begin-repeat"]) { if (NSDictionary * beginRep = [mdict objectForKey:@"begin-repeat"]) {
VLRepeat rep; VLRepeat rep;