X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Faudio-item.cc;h=b5edac5fbb68028a66dde6cea02c83ae87756c65;hb=9f4d4a1ce5dc0fad4ed27c9cc1e357cae090b1b1;hp=5d78ec4bd58794be869199bcbe49e7bc33cf4f13;hpb=1a72867b0c5db394ec87a1901910792cf850bc57;p=lilypond.git

diff --git a/lily/audio-item.cc b/lily/audio-item.cc
index 5d78ec4bd5..b5edac5fbb 100644
--- a/lily/audio-item.cc
+++ b/lily/audio-item.cc
@@ -3,46 +3,47 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2006 Jan Nieuwenhuizen <janneke@gnu.org>
 */
-#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 (std::string instrument_string)
 {
-  str_ = instrument_str;
+  str_ = instrument_string;
 }
 
 Audio_item::Audio_item ()
 {
-  audio_column_l_ = 0;
+  audio_column_ = 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;
+  transposing_ = transposing_i;
 }
 
 void
-Audio_note::tie_to (Audio_note* t)
+Audio_note::tie_to (Audio_note *t)
 {
   tied_ = t;
-  Audio_note* first = t;
+  Audio_note *first = t;
   while (first->tied_)
     first = first->tied_;
   first->length_mom_ += length_mom_;
   length_mom_ = 0;
 }
 
-		    
-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)
@@ -52,45 +53,18 @@ Audio_dynamic::Audio_dynamic (Real volume)
 
 Audio_tempo::Audio_tempo (int per_minute_4_i)
 {
-  per_minute_4_i_ = per_minute_4_i;
+  per_minute_4_ = per_minute_4_i;
 }
 
 Audio_time_signature::Audio_time_signature (int beats, int one_beat)
 {
-  beats_i_ = beats;
-  one_beat_i_ = one_beat;
+  beats_ = beats;
+  one_beat_ = one_beat;
 }
 
-Audio_text::Audio_text (Audio_text::Type type, String text_str)
+Audio_text::Audio_text (Audio_text::Type type, std::string text_string)
 {
-  text_str_ = text_str;
+  text_string_ = text_string;
   type_ = type;
 }
 
-Audio_tie::Audio_tie ()
-{
-  note_l_drul_[RIGHT] = 0;
-  note_l_drul_[LEFT] = 0;
-}
-
-void
-Audio_tie::set_note (Direction d, Audio_note* note_l)
-{
-  assert (!note_l_drul_[d]);
-  note_l_drul_[d] = note_l;
-  //set_bound (d, head_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
-}
-