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

Play proper pitch for extended notes (Tracker #3284515)

Browse Source
This commit is contained in:
Matthias Neeracher 2011-08-26 16:15:10 +00:00
parent c14ace59f8
commit ec927024f5
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Sources/VLModel.cpp
View File

@ -887,18 +887,21 @@ void VLSong::DelNote(size_t measure, VLFraction at)
fMeasures.pop_back(); fMeasures.pop_back();
} }
void VLSong::ExtendNote(size_t measure, VLFraction at) VLNote VLSong::ExtendNote(size_t measure, VLFraction at)
{ {
VLNoteList::iterator i = fMeasures[measure].fMelody.begin(); VLNoteList::iterator i = fMeasures[measure].fMelody.begin();
VLNoteList::iterator end= fMeasures[measure].fMelody.end(); VLNoteList::iterator end= fMeasures[measure].fMelody.end();
if (i==end)
return VLNote(); // Empty song, do nothing
for (VLFraction t(0); i != end && t+i->fDuration <= at; ++i) for (VLFraction t(0); i != end && t+i->fDuration <= at; ++i)
t += i->fDuration; t += i->fDuration;
if (i == end) if (i == end)
--i; --i;
if (i->fPitch == VLNote::kNoPitch) if (i->fPitch == VLNote::kNoPitch)
return; // Don't extend rests return *i; // Don't extend rests
for (;;) { for (;;) {
VLNoteList::iterator j=i; VLNoteList::iterator j=i;
@ -942,6 +945,7 @@ void VLSong::ExtendNote(size_t measure, VLFraction at)
} }
break; break;
} }
return *i;
} }
bool VLSong::IsNonEmpty() const bool VLSong::IsNonEmpty() const

2
Sources/VLModel.h
View File

@ -334,7 +334,7 @@ public:
void AddNote(VLLyricsNote note, size_t measure, VLFraction at); void AddNote(VLLyricsNote note, size_t measure, VLFraction at);
void DelChord(size_t measure, VLFraction at); void DelChord(size_t measure, VLFraction at);
void DelNote(size_t measure, VLFraction at); void DelNote(size_t measure, VLFraction at);
void ExtendNote(size_t measure, VLFraction at); VLNote ExtendNote(size_t measure, VLFraction at);
void AddRepeat(size_t beginMeasure, size_t endMeasure, int times); void AddRepeat(size_t beginMeasure, size_t endMeasure, int times);
void DelRepeat(size_t beginMeasure, size_t endMeasure); void DelRepeat(size_t beginMeasure, size_t endMeasure);
void AddEnding(size_t beginMeasure, size_t endMeasure, size_t volta); void AddEnding(size_t beginMeasure, size_t endMeasure, size_t volta);

2
Sources/VLSheetViewNotes.mm
View File

@ -32,7 +32,7 @@
} }
[[self document] willChangeSong]; [[self document] willChangeSong];
if (fCursorAccidental == kMusicExtendCursor) if (fCursorAccidental == kMusicExtendCursor)
[self song]->ExtendNote(fCursorMeasure, fCursorAt); newNote = [self song]->ExtendNote(fCursorMeasure, fCursorAt);
else if (fClickMode == 'k') else if (fClickMode == 'k')
[self song]->DelNote(fCursorMeasure, fCursorAt); [self song]->DelNote(fCursorMeasure, fCursorAt);
else else