X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Faudio-item.cc;h=41381458f6e4f474a6d5c3167254d465c387d791;hb=61f4e2136fd454fda734f7ebc0f2847848f4e9ca;hp=689c34af3851cebc7e5f87fe7ed7e8a79e4ff0f0;hpb=bdabe71a2bdda41b64c0000da6023771701f4def;p=lilypond.git

diff --git a/lily/audio-item.cc b/lily/audio-item.cc
index 689c34af38..41381458f6 100644
--- a/lily/audio-item.cc
+++ b/lily/audio-item.cc
@@ -3,82 +3,159 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Jan Nieuwenhuizen <jan@digicash.com>
+  (c) 1997--2007 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "audio-item.hh"
+
 #include "midi-item.hh"
+#include "audio-column.hh"
+
+Audio_instrument::Audio_instrument (string instrument_string)
+{
+  str_ = instrument_string;
+}
+
+void
+Audio_item::render ()
+{
+}
+
+Audio_column *
+Audio_item::get_column () const
+{
+  return audio_column_;
+}
 
-#if 0
-Audio_instrument::Audio_instrument( String instrument_str )
-	: Audio_item( 0 )
+Audio_item::Audio_item ()
 {
+  audio_column_ = 0;
 }
-#endif
-                                      
-Audio_item::Audio_item( Request* req_l )
+
+Audio_note::Audio_note (Pitch p, Moment m, bool tie_event, Pitch transposing)
 {
-    audio_column_l_ = 0;
-    req_l_ = req_l;
+  pitch_ = p;
+  length_mom_ = m;
+  tied_ = 0;
+  transposing_ = transposing;
+  tie_event_ = tie_event;
 }
 
-Audio_key::Audio_key( Request* req_l )
-	: Audio_item( req_l )
+void
+Audio_note::tie_to (Audio_note *t)
 {
+  tied_ = t;
+  Audio_note *first = t;
+  while (first->tied_)
+    first = first->tied_;
+  first->length_mom_ += length_mom_;
+  length_mom_ = 0;
 }
 
-Midi_item*
-Audio_key::midi_item_p()
+Audio_key::Audio_key (int acc, bool major)
 {
-    return new Midi_key( this );
+  accidentals_ = acc;
+  major_ = major;
 }
 
+Audio_dynamic::Audio_dynamic ()
+{
+  volume_ = -1;
+}
 
-Audio_note::Audio_note( Request* req_l, bool on_b )
-	: Audio_item( req_l )
+Audio_span_dynamic::Audio_span_dynamic ()
 {
-    on_b_ = on_b;
+  grow_dir_ = CENTER;
 }
 
-Midi_item*
-Audio_note::midi_item_p()
+void
+Audio_span_dynamic::add_absolute (Audio_dynamic *d)
 {
-    return new Midi_note( this );
+  assert (d);
+  dynamics_.push_back (d);
 }
 
-Audio_tempo::Audio_tempo( int per_minute_4_i )
-	: Audio_item( 0 )
+Moment
+remap_grace_duration (Moment m)
 {
-    per_minute_4_i_ = per_minute_4_i;
+  return Moment (m.main_part_ + Rational (9,40) * m.grace_part_,
+		 Rational (0));
 }
 
-Midi_item*
-Audio_tempo::midi_item_p()
+Real
+moment_to_real (Moment m)
 {
-    return new Midi_tempo( this );
+  return remap_grace_duration (m).main_part_.to_double ();
 }
 
-Audio_meter::Audio_meter( Request* req_l )
-	: Audio_item( req_l )
+int
+moment_to_ticks (Moment m)
 {
+  return int (moment_to_real (m) * 384 * 4);
 }
 
-Midi_item*
-Audio_meter::midi_item_p()
+void
+Audio_span_dynamic::render ()
+{
+  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);
+    }
+
+  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.0);
+
+  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)
 {
-    return new Midi_meter( this );
+  per_minute_4_ = per_minute_4;
 }
 
-Audio_text::Audio_text( Audio_text::Type type, String text_str )
-	: Audio_item( 0 )
+Audio_time_signature::Audio_time_signature (int beats, int one_beat)
 {
-	text_str_ = text_str;
-	type_ = type;
+  beats_ = beats;
+  one_beat_ = one_beat;
 }
 
-Midi_item*
-Audio_text::midi_item_p()
+Audio_text::Audio_text (Audio_text::Type type, string text_string)
 {
-    return new Midi_text( this );
+  text_string_ = text_string;
+  type_ = type;
 }