X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Faudio-item.cc;h=b351a576252761a27f73ac45fb9e6bc70f962417;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=2ec7736a40af93be12411c6e86a9671b6d25e5e5;hpb=31653bf1d61a33ef8bc8c871d60c6b3452d04d28;p=lilypond.git

diff --git a/lily/audio-item.cc b/lily/audio-item.cc
index 2ec7736a40..b351a57625 100644
--- a/lily/audio-item.cc
+++ b/lily/audio-item.cc
@@ -3,115 +3,159 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1998 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2008 Jan Nieuwenhuizen <janneke@gnu.org>
 */
-#include "debug.hh"
+
 #include "audio-item.hh"
+
 #include "midi-item.hh"
-#include "request.hh"
 #include "audio-column.hh"
 
-Audio_instrument::Audio_instrument (String instrument_str)
-  : Audio_item (0)
+Audio_instrument::Audio_instrument (string instrument_string)
 {
-  str_ = instrument_str;
+  str_ = instrument_string;
 }
 
-Midi_item*
-Audio_instrument::midi_item_p()
+void
+Audio_item::render ()
 {
-  return str_.length_i() ? new Midi_instrument(0, str_) : 0;
 }
-IMPLEMENT_IS_TYPE_B1(Audio_instrument, Audio_item);
 
-Audio_item::Audio_item (Request* req_l)
+Audio_column *
+Audio_item::get_column () const
 {
-  audio_column_l_ = 0;
-  req_l_ = req_l;
+  return audio_column_;
 }
 
-Audio_key::Audio_key (Request* req_l)
-  : Audio_item (req_l)
+Audio_item::Audio_item ()
 {
+  audio_column_ = 0;
 }
 
-Midi_item*
-Audio_key::midi_item_p()
+Audio_note::Audio_note (Pitch p, Moment m, bool tie_event, Pitch transposing)
 {
-  return new Midi_key (this);
+  pitch_ = p;
+  length_mom_ = m;
+  tied_ = 0;
+  transposing_ = transposing;
+  tie_event_ = tie_event;
 }
-IMPLEMENT_IS_TYPE_B1 (Audio_key, Audio_item);
 
-Audio_note::Audio_note (Request* req_l, int transposing_i)
-  : Audio_item (req_l)
+void
+Audio_note::tie_to (Audio_note *t)
 {
-  transposing_i_ = transposing_i;
+  tied_ = t;
+  Audio_note *first = t;
+  while (first->tied_)
+    first = first->tied_;
+  first->length_mom_ += length_mom_;
+  length_mom_ = 0;
 }
 
-Midi_item*
-Audio_note::midi_item_p()
+Audio_key::Audio_key (int acc, bool major)
 {
-  return new Midi_note (this);
+  accidentals_ = acc;
+  major_ = major;
 }
 
-IMPLEMENT_IS_TYPE_B1(Audio_note, Audio_item);
-
-Audio_tempo::Audio_tempo (int per_minute_4_i)
-  : Audio_item (0)
+Audio_dynamic::Audio_dynamic ()
 {
-  per_minute_4_i_ = per_minute_4_i;
+  volume_ = -1;
 }
 
-Midi_item*
-Audio_tempo::midi_item_p()
+Audio_span_dynamic::Audio_span_dynamic ()
 {
-  return new Midi_tempo (this);
+  grow_dir_ = CENTER;
 }
 
-IMPLEMENT_IS_TYPE_B1(Audio_tempo, Audio_item);
-
-Audio_time_signature::Audio_time_signature (Request* req_l)
-  : Audio_item (req_l)
+void
+Audio_span_dynamic::add_absolute (Audio_dynamic *d)
 {
+  assert (d);
+  dynamics_.push_back (d);
 }
 
-Midi_item*
-Audio_time_signature::midi_item_p()
+Moment
+remap_grace_duration (Moment m)
 {
-  return new Midi_time_signature (this);
+  return Moment (m.main_part_ + Rational (9,40) * m.grace_part_,
+		 Rational (0));
 }
 
-IMPLEMENT_IS_TYPE_B1(Audio_time_signature, Audio_item);
-
-Audio_text::Audio_text (Audio_text::Type type, String text_str)
-  : Audio_item (0)
+Real
+moment_to_real (Moment m)
 {
-  text_str_ = text_str;
-  type_ = type;
+  return remap_grace_duration (m).main_part_.to_double ();
 }
 
-Midi_item*
-Audio_text::midi_item_p()
+int
+moment_to_ticks (Moment m)
 {
-  return text_str_.length_i() ? new Midi_text(this) : 0;
+  return int (moment_to_real (m) * 384 * 4);
 }
 
-IMPLEMENT_IS_TYPE_B1(Audio_text, Audio_item);
-IMPLEMENT_IS_TYPE_B1(Audio_item, Audio_element);
-
 void
-Audio_item::do_print () const
+Audio_span_dynamic::render ()
 {
-#ifndef NPRINT
-  if (audio_column_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_)
     {
-      DOUT << "at: "<< audio_column_l_->at_mom ();
+      dynamics_.erase (dynamics_.end () - 1);
     }
-  if (req_l_)
+
+  if (dynamics_.size () <= 1)
+    {
+      programming_error ("(de)crescendo on items with specified volume.");
+      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);
+
+  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 ++)
     {
-      DOUT << "from: ";
-      req_l_->print ();
+      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;	
     }
-#endif
+}
+
+
+
+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;
 }