patch::: 1.5.41.jcn1

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

diff --git a/lily/audio-item.cc b/lily/audio-item.cc
index 5d78ec4bd58794be869199bcbe49e7bc33cf4f13..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--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c)  1997--2002 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 #include "debug.hh"
 #include "audio-item.hh"
@@ -20,7 +20,7 @@ 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;
@@ -40,9 +40,10 @@ Audio_note::tie_to (Audio_note* t)
 }
 
                    
-Audio_key::Audio_key (Key_def const& k)
+Audio_key::Audio_key (int acc, bool major)
 {
-  key_ = k;
+  accidentals_=acc;
+  major_=major;
 }
 
 Audio_dynamic::Audio_dynamic (Real volume)
@@ -83,14 +84,5 @@ Audio_tie::set_note (Direction d, Audio_note* note_l)
   //  add_dependency (head_l);
 }
 
-void
-Audio_item::do_print () const
-{
-#ifndef NPRINT
-  if (audio_column_l_)
-    {
-      DEBUG_OUT << "at: "<< audio_column_l_->at_mom ();
-    }
-#endif
-}
+