/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 1997--2012 Jan Nieuwenhuizen <janneke@gnu.org>
+ Copyright (C) 1997--2015 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
#include "midi-item.hh"
#include "audio-column.hh"
+#include "international.hh"
Audio_instrument::Audio_instrument (string instrument_string)
{
{
}
-Audio_note::Audio_note (Pitch p, Moment m, bool tie_event, Pitch transposing)
+Audio_note::Audio_note (Pitch p, Moment m, bool tie_event, Pitch transposing,
+ int velocity)
: pitch_ (p),
length_mom_ (m),
transposing_ (transposing),
dynamic_ (0),
+ extra_velocity_ (velocity),
tied_ (0),
tie_event_ (tie_event)
{
major_ = major;
}
-Audio_dynamic::Audio_dynamic ()
- : volume_ (-1),
- silent_ (false)
-{
-}
-
-Audio_span_dynamic::Audio_span_dynamic (Real min_volume, Real max_volume)
-{
- grow_dir_ = CENTER;
- min_volume_ = min_volume;
- max_volume_ = max_volume;
-}
+const Real Audio_span_dynamic::MINIMUM_VOLUME = 0.0;
+const Real Audio_span_dynamic::MAXIMUM_VOLUME = 1.0;
+const Real Audio_span_dynamic::DEFAULT_VOLUME = 90.0 / 127.0;
-void
-Audio_span_dynamic::add_absolute (Audio_dynamic *d)
+Audio_span_dynamic::Audio_span_dynamic (Moment mom, Real volume)
+ : start_moment_ (mom),
+ duration_ (0)
{
- assert (d);
- dynamics_.push_back (d);
+ set_volume (volume, volume);
}
Moment
return int (moment_to_real (m) * 384 * 4);
}
-void
-Audio_span_dynamic::render ()
+void Audio_span_dynamic::set_end_moment (Moment mom)
{
- if (dynamics_.size () <= 1)
- return;
-
- assert (dynamics_[0]->volume_ >= 0);
-
- while (dynamics_.back ()->volume_ > 0
- && dynamics_.size () > 1
- && sign (dynamics_.back ()->volume_ - dynamics_[0]->volume_) != grow_dir_)
+ if (mom < start_moment_)
{
- dynamics_.erase (dynamics_.end () - 1);
+ programming_error (_f ("end moment (%s) < start moment (%s)",
+ mom.to_string ().c_str (),
+ start_moment_.to_string ().c_str ()));
+ mom = start_moment_;
}
- if (dynamics_.size () <= 1)
+ duration_ = moment_to_real (mom - start_moment_);
+}
+
+void
+Audio_span_dynamic::set_volume (Real start, Real target)
+{
+ if (!(start >= 0))
{
- programming_error ("Impossible or ambiguous (de)crescendo in MIDI.");
- return;
+ programming_error (_f ("invalid start volume: %f", start));
+ start = DEFAULT_VOLUME;
}
- Real start_v = dynamics_[0]->volume_;
- if (dynamics_.back ()->volume_ < 0)
+ if (!(target >= 0))
{
- // The dynamic spanner does not end with an explicit dynamic script
- // event. Adjust the end volume by at most 1/4 of the available
- // volume range in this case.
- dynamics_.back ()->volume_ = max (min (start_v + grow_dir_ * (max_volume_ - min_volume_) * 0.25, max_volume_), min_volume_);
+ programming_error (_f ("invalid target volume: %f", target));
+ target = start;
}
- Real delta_v = dynamics_.back ()->volume_ - dynamics_[0]->volume_;
-
- Moment start = dynamics_[0]->get_column ()->when ();
+ start_volume_ = start;
+ gain_ = target - start;
+}
- Real total_t = moment_to_real (dynamics_.back ()->get_column ()->when () - start);
+Real Audio_span_dynamic::get_volume (Moment mom) const
+{
+ const Real when = moment_to_real (mom - start_moment_);
- for (vsize i = 1; i < dynamics_.size (); i++)
+ if (when <= 0)
{
- 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);
+ if (when < 0)
+ programming_error (_f ("asked to compute volume at %f for dynamic span of duration %f starting at %s",
+ when, duration_,
+ start_moment_.to_string ().c_str ()));
+ return start_volume_;
+ }
- dynamics_[i]->volume_ = v;
+ if (when >= duration_)
+ {
+ programming_error (_f ("asked to compute volume at +%f for dynamic span of duration %f starting at %s",
+ when, duration_,
+ start_moment_.to_string ().c_str ()));
+ return start_volume_ + gain_;
}
+
+ return start_volume_ + gain_ * (when / duration_);
}
Audio_tempo::Audio_tempo (int per_minute_4)
one_beat_ = one_beat;
}
-Audio_text::Audio_text (Audio_text::Type type, string text_string)
+Audio_text::Audio_text (Audio_text::Type type, const string &text_string)
{
text_string_ = text_string;
type_ = type;
}
+Audio_control_change::Audio_control_change (int control, int value)
+ : control_ (control),
+ value_ (value)
+{
+}