/*
- 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--2011 Jan Nieuwenhuizen <janneke@gnu.org>
- (c) 1997--2009 Jan Nieuwenhuizen <janneke@gnu.org>
+ 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 <http://www.gnu.org/licenses/>.
*/
#include "audio-item.hh"
}
Audio_item::Audio_item ()
+ : audio_column_ (0)
+ , channel_ (0)
{
- audio_column_ = 0;
}
Audio_note::Audio_note (Pitch p, Moment m, bool tie_event, Pitch transposing)
+ : pitch_ (p)
+ , length_mom_ (m)
+ , transposing_ (transposing)
+ , dynamic_ (0)
+ , tied_ (0)
+ , tie_event_ (tie_event)
{
- pitch_ = p;
- length_mom_ = m;
- tied_ = 0;
- transposing_ = transposing;
- tie_event_ = tie_event;
}
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;
}
}
Audio_dynamic::Audio_dynamic ()
+ : volume_ (-1)
+ , silent_ (false)
{
- volume_ = -1;
}
Audio_span_dynamic::Audio_span_dynamic ()
if (dynamics_.size () <= 1)
{
- programming_error ("(de)crescendo on items with specified volume.");
+ programming_error ("Impossible or ambiguous (de)crescendo in MIDI.");
return ;
}
-
+
Real delta_v = grow_dir_ * 0.1;
-
+
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.1);
Moment start = dynamics_[0]->get_column ()->when ();
Real total_t = moment_to_real (dynamics_.back ()->get_column ()->when () - start);
-
+
for (vsize i = 1; i < dynamics_.size (); i ++)
{
Moment dt_moment = dynamics_[i]->get_column ()->when ()
- start;
Real dt = moment_to_real (dt_moment);
-
+
Real v = start_v + delta_v * (dt / total_t);
- dynamics_[i]->volume_ = v;
+ dynamics_[i]->volume_ = v;
}
}