X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Faudio-item.cc;h=8460ee8e5eeb1b917f30b8c3ed1c335564c7b101;hb=743f0d4b067e76d591487f085240a7ff9ace85a7;hp=b4d358c7f7fe9c176902cfce58f1ace95f6233fd;hpb=f988425624a6f6d1a48aea0ac0c1c84ff0857e56;p=lilypond.git

diff --git a/lily/audio-item.cc b/lily/audio-item.cc
index b4d358c7f7..8460ee8e5e 100644
--- a/lily/audio-item.cc
+++ b/lily/audio-item.cc
@@ -1,87 +1,177 @@
 /*
-  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--2012 Jan Nieuwenhuizen <janneke@gnu.org>
 
-  (c)  1997--2000 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 "debug.hh"
+
 #include "audio-item.hh"
+
 #include "midi-item.hh"
 #include "audio-column.hh"
 
-Audio_instrument::Audio_instrument (String instrument_str)
+Audio_instrument::Audio_instrument (string instrument_string)
+{
+  str_ = instrument_string;
+}
+
+void
+Audio_item::render ()
 {
-  str_ = instrument_str;
+}
+
+Audio_column *
+Audio_item::get_column () const
+{
+  return audio_column_;
 }
 
 Audio_item::Audio_item ()
+  : audio_column_ (0),
+    channel_ (0)
 {
-  audio_column_l_ = 0;
 }
 
-Audio_note::Audio_note (Musical_pitch p, Moment m, int transposing_i)
+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_i_ = transposing_i;
 }
 
 void
-Audio_note::tie_to (Audio_note* t)
+Audio_note::tie_to (Audio_note *t, Moment skip)
 {
   tied_ = t;
-  Audio_note* first = 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_key::Audio_key () // Key_def const& k)
+Audio_key::Audio_key (int acc, bool major)
 {
-  //fixme.
+  accidentals_ = acc;
+  major_ = major;
 }
 
-Audio_dynamic::Audio_dynamic (Real volume)
+Audio_dynamic::Audio_dynamic ()
+  : volume_ (-1),
+    silent_ (false)
 {
-  volume_ = volume;
 }
 
-Audio_tempo::Audio_tempo (int per_minute_4_i)
+Audio_span_dynamic::Audio_span_dynamic (Real min_volume, Real max_volume)
 {
-  per_minute_4_i_ = per_minute_4_i;
+  grow_dir_ = CENTER;
+  min_volume_ = min_volume;
+  max_volume_ = max_volume;
 }
 
-Audio_time_signature::Audio_time_signature (int beats, int one_beat)
+void
+Audio_span_dynamic::add_absolute (Audio_dynamic *d)
 {
-  beats_i_ = beats;
-  one_beat_i_ = one_beat;
+  assert (d);
+  dynamics_.push_back (d);
 }
 
-Audio_text::Audio_text (Audio_text::Type type, String text_str)
+Moment
+remap_grace_duration (Moment m)
 {
-  text_str_ = text_str;
-  type_ = type;
+  return Moment (m.main_part_ + Rational (9, 40) * m.grace_part_,
+                 Rational (0));
 }
 
-Audio_tie::Audio_tie ()
+Real
+moment_to_real (Moment m)
 {
-  note_l_drul_[RIGHT] = 0;
-  note_l_drul_[LEFT] = 0;
+  return remap_grace_duration (m).main_part_.to_double ();
+}
+
+int
+moment_to_ticks (Moment m)
+{
+  return int (moment_to_real (m) * 384 * 4);
 }
 
 void
-Audio_tie::set_note (Direction d, Audio_note* note_l)
+Audio_span_dynamic::render ()
 {
-  assert (!note_l_drul_[d]);
-  note_l_drul_[d] = note_l;
-  //set_bound (d, head_l);
+  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_)
+    {
+      dynamics_.erase (dynamics_.end () - 1);
+    }
 
-  //  add_dependency (head_l);
+  if (dynamics_.size () <= 1)
+    {
+      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, max_volume_), min_volume_);
+
+  delta_v = dynamics_.back ()->volume_ - dynamics_[0]->volume_;
+
+  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;
+    }
 }
 
+Audio_tempo::Audio_tempo (int per_minute_4)
+{
+  per_minute_4_ = per_minute_4;
+}
 
+Audio_time_signature::Audio_time_signature (int beats, int one_beat)
+{
+  beats_ = beats;
+  one_beat_ = one_beat;
+}
+
+Audio_text::Audio_text (Audio_text::Type type, string text_string)
+{
+  text_string_ = text_string;
+  type_ = type;
+}