/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 1997--2011 Jan Nieuwenhuizen <janneke@gnu.org>
+ Copyright (C) 1997--2012 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
}
Audio_item::Audio_item ()
- : audio_column_ (0)
- , channel_ (0)
+ : audio_column_ (0),
+ channel_ (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_dynamic::Audio_dynamic ()
+ : volume_ (-1),
+ silent_ (false)
{
- volume_ = -1;
}
-Audio_span_dynamic::Audio_span_dynamic ()
+Audio_span_dynamic::Audio_span_dynamic (Real min_volume, Real max_volume)
{
grow_dir_ = CENTER;
+ min_volume_ = min_volume;
+ max_volume_ = max_volume;
}
void
Moment
remap_grace_duration (Moment m)
{
- return Moment (m.main_part_ + Rational (9,40) * m.grace_part_,
- Rational (0));
+ return Moment (m.main_part_ + Rational (9, 40) * m.grace_part_,
+ Rational (0));
}
Real
Audio_span_dynamic::render ()
{
if (dynamics_.size () <= 1)
- return ;
+ return;
assert (dynamics_[0]->volume_ >= 0);
- while (dynamics_.back ()->volume_ > 0
- && dynamics_.size () > 1
- && sign (dynamics_.back ()->volume_ - dynamics_[0]->volume_) != grow_dir_)
+ while (dynamics_.back ()->volume_ > 0
+ && dynamics_.size () > 1
+ && sign (dynamics_.back ()->volume_ - dynamics_[0]->volume_) != grow_dir_)
{
dynamics_.erase (dynamics_.end () - 1);
}
if (dynamics_.size () <= 1)
{
programming_error ("Impossible or ambiguous (de)crescendo in MIDI.");
- return ;
+ 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);
+ dynamics_.back ()->volume_ = max (min (start_v + grow_dir_ * 0.25, max_volume_), min_volume_);
delta_v = dynamics_.back ()->volume_ - dynamics_[0]->volume_;
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;
+ - start;
- Real dt = moment_to_real (dt_moment);
+ Real dt = moment_to_real (dt_moment);
- Real v = start_v + delta_v * (dt / total_t);
+ Real v = start_v + delta_v * (dt / total_t);
dynamics_[i]->volume_ = v;
}
}
-
-
Audio_tempo::Audio_tempo (int per_minute_4)
{
per_minute_4_ = per_minute_4;