/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 1997--2011 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_item::Audio_item ()
+ : audio_column_ (0),
+ channel_ (0)
{
- audio_column_ = 0;
}
-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)
{
- pitch_ = p;
- length_mom_ = m;
- tied_ = 0;
- transposing_ = transposing;
- tie_event_ = tie_event;
}
void
Audio_note::tie_to (Audio_note *t, Moment skip)
{
tied_ = t;
- Audio_note *first = t;
- while (first->tied_)
- first = first->tied_;
+ Audio_note *first = tie_head();
// 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_key::Audio_key (int acc, bool major)
+Audio_note *
+Audio_note::tie_head ()
{
- accidentals_ = acc;
- major_ = major;
+ Audio_note *first = this;
+ while (first->tied_)
+ first = first->tied_;
+ return first;
}
-Audio_dynamic::Audio_dynamic ()
+string
+Audio_note::to_string () const
{
- volume_ = -1;
+ string s = "#<Audio_note pitch ";
+ s += pitch_.to_string();
+ s += " len ";
+ s += length_mom_.to_string();
+ if (tied_)
+ {
+ s += " tied to " + tied_->to_string();
+ }
+ if (tie_event_)
+ {
+ s += " tie_event";
+ }
+ s += ">";
+ return s;
}
-Audio_span_dynamic::Audio_span_dynamic ()
+Audio_key::Audio_key (int acc, bool major)
{
- grow_dir_ = CENTER;
+ accidentals_ = acc;
+ major_ = major;
}
-void
-Audio_span_dynamic::add_absolute (Audio_dynamic *d)
+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;
+
+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
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
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 ;
+ if (mom < start_moment_)
+ {
+ programming_error (_f ("end moment (%s) < start moment (%s)",
+ mom.to_string ().c_str (),
+ start_moment_.to_string ().c_str ()));
+ mom = start_moment_;
+ }
- assert (dynamics_[0]->volume_ >= 0);
+ duration_ = moment_to_real (mom - start_moment_);
+}
- while (dynamics_.back ()->volume_ > 0
- && dynamics_.size () > 1
- && sign (dynamics_.back ()->volume_ - dynamics_[0]->volume_) != grow_dir_)
+void
+Audio_span_dynamic::set_volume (Real start, Real target)
+{
+ if (!(start >= 0))
{
- dynamics_.erase (dynamics_.end () - 1);
+ programming_error (_f ("invalid start volume: %f", start));
+ start = DEFAULT_VOLUME;
}
- if (dynamics_.size () <= 1)
+ if (!(target >= 0))
{
- programming_error ("Impossible or ambiguous (de)crescendo in MIDI.");
- return ;
+ programming_error (_f ("invalid target volume: %f", target));
+ target = start;
}
- 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);
-
- 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);
-
- dynamics_[i]->volume_ = v;
+ 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_;
}
-}
+ 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)
+{
+}
projects / lilypond.git / blobdiff