X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Faudio-item.cc;h=fb1976d561d75471ee4a2a20c97e9af087baa795;hb=77706635f33adff837dc7af0482f51ff3f0f5cb1;hp=33e54d713a869b7bdfc1225fc2a9774b1ebdbe08;hpb=0e5d83a9ceb4a143f83d22406d7eb816314ff9f7;p=lilypond.git diff --git a/lily/audio-item.cc b/lily/audio-item.cc index 33e54d713a..fb1976d561 100644 --- a/lily/audio-item.cc +++ b/lily/audio-item.cc @@ -1,9 +1,20 @@ /* - audio-item.cc -- implement Audio items. + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter + Copyright (C) 1997--2010 Jan Nieuwenhuizen - (c) 1997--2009 Jan Nieuwenhuizen + LilyPond is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + LilyPond is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . */ #include "audio-item.hh" @@ -42,13 +53,15 @@ Audio_note::Audio_note (Pitch p, Moment m, bool tie_event, Pitch transposing) } void -Audio_note::tie_to (Audio_note *t) +Audio_note::tie_to (Audio_note *t, Moment skip) { tied_ = t; Audio_note *first = t; while (first->tied_) first = first->tied_; - first->length_mom_ += length_mom_; + // Add the skip to the tied note and the length of the appended note + // to the full duration of the tie... + first->length_mom_ += skip + length_mom_; length_mom_ = 0; }