X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Faudio-item.cc;h=dde143951f20478950ec254211a28c2f6c4eac8c;hb=0a0da41d935f7744e7ffd934034f25c40d4c59be;hp=160b0dda21687883e2ffbfa5ca4c465ed837dabc;hpb=b6731d2f15343245a9b8e1dff479461a5dc4bcbe;p=lilypond.git diff --git a/lily/audio-item.cc b/lily/audio-item.cc index 160b0dda21..dde143951f 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--2009 Jan Nieuwenhuizen - (c) 1997--2006 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; } @@ -75,11 +88,23 @@ Audio_span_dynamic::add_absolute (Audio_dynamic *d) dynamics_.push_back (d); } -static Real -moment2real (Moment m) +Moment +remap_grace_duration (Moment m) +{ + return Moment (m.main_part_ + Rational (9,40) * m.grace_part_, + Rational (0)); +} + +Real +moment_to_real (Moment m) +{ + return remap_grace_duration (m).main_part_.to_double (); +} + +int +moment_to_ticks (Moment m) { - return m.main_part_.to_double () - + 0.1 * m.grace_part_.to_double (); + return int (moment_to_real (m) * 384 * 4); } void @@ -107,20 +132,20 @@ Audio_span_dynamic::render () Real start_v = dynamics_[0]->volume_; if (dynamics_.back ()->volume_ < 0) - dynamics_.back ()->volume_ = max (min (start_v + grow_dir_ * 0.25, 1.0), 0.0); + dynamics_.back ()->volume_ = max (min (start_v + grow_dir_ * 0.25, 1.0), 0.1); delta_v = dynamics_.back ()->volume_ - dynamics_[0]->volume_; Moment start = dynamics_[0]->get_column ()->when (); - Real total_t = moment2real (dynamics_.back ()->get_column ()->when () - start); + Real total_t = moment_to_real (dynamics_.back ()->get_column ()->when () - start); - for (vsize i = 1; i < dynamics_.size(); i ++) + for (vsize i = 1; i < dynamics_.size (); i ++) { Moment dt_moment = dynamics_[i]->get_column ()->when () - start; - Real dt = moment2real (dt_moment); + Real dt = moment_to_real (dt_moment); Real v = start_v + delta_v * (dt / total_t);