small fixes

[lilypond.git] / lily / audio-item.cc

diff --git a/lily/audio-item.cc b/lily/audio-item.cc
index f48f92179c2b23c16015742e32a75e75535120fa..6b5f43dce72be194962b9ff814d0d266cf813781 100644 (file)
--- a/lily/audio-item.cc
+++ b/lily/audio-item.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1999 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c)  1997--2002 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 #include "debug.hh"
 #include "audio-item.hh"
@@ -20,16 +20,35 @@ Audio_item::Audio_item ()
   audio_column_l_ = 0;
 }
 
-Audio_note::Audio_note (Musical_pitch p, Moment m, int transposing_i)
+Audio_note::Audio_note (Pitch p, Moment m, int transposing_i)
 {
   pitch_ = p;
   length_mom_ = m;
+  tied_ = 0;
   transposing_i_ = transposing_i;
 }
 
-Audio_key::Audio_key (Key_def const& k)
+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;
+}
+
+                   
+Audio_key::Audio_key (int acc, bool major)
 {
-  key_ = k;
+  accidentals_=acc;
+  major_=major;
+}
+
+Audio_dynamic::Audio_dynamic (Real volume)
+{
+  volume_ = volume;
 }
 
 Audio_tempo::Audio_tempo (int per_minute_4_i)
@@ -60,19 +79,10 @@ Audio_tie::set_note (Direction d, Audio_note* note_l)
 {
   assert (!note_l_drul_[d]);
   note_l_drul_[d] = note_l;
-  //set_bounds (d, head_l);
+  //set_bound (d, head_l);
 
   //  add_dependency (head_l);
 }
 
-void
-Audio_item::do_print () const
-{
-#ifndef NPRINT
-  if (audio_column_l_)
-    {
-      DOUT << "at: "<< audio_column_l_->at_mom ();
-    }
-#endif
-}
+