X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Faudio-item.cc;h=3cf2300827ebda38c1d0f868ce05eea3b1efb536;hb=77dba2aad902de14961ca17d32e3551eba7bab08;hp=2e4e98747ce00bdcc46f86178face423c62a6021;hpb=434da79e9d7684b2b05fa92a6d808d4ea7933046;p=lilypond.git

diff --git a/lily/audio-item.cc b/lily/audio-item.cc
index 2e4e98747c..3cf2300827 100644
--- a/lily/audio-item.cc
+++ b/lily/audio-item.cc
@@ -3,29 +3,30 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1999 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2004 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 (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
@@ -40,52 +41,31 @@ 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_tempo::Audio_tempo (int per_minute_4_i)
+Audio_dynamic::Audio_dynamic (Real volume)
 {
-  per_minute_4_i_ = per_minute_4_i;
+  volume_ = volume;
 }
 
-Audio_time_signature::Audio_time_signature (int beats, int one_beat)
-{
-  beats_i_ = beats;
-  one_beat_i_ = one_beat;
-}
-
-Audio_text::Audio_text (Audio_text::Type type, String text_str)
-{
-  text_str_ = text_str;
-  type_ = type;
-}
-
-Audio_tie::Audio_tie ()
+Audio_tempo::Audio_tempo (int per_minute_4_i)
 {
-  note_l_drul_[RIGHT] = 0;
-  note_l_drul_[LEFT] = 0;
+  per_minute_4_ = per_minute_4_i;
 }
 
-void
-Audio_tie::set_note (Direction d, Audio_note* note_l)
+Audio_time_signature::Audio_time_signature (int beats, int one_beat)
 {
-  assert (!note_l_drul_[d]);
-  note_l_drul_[d] = note_l;
-  //set_bounds (d, head_l);
-
-  //  add_dependency (head_l);
+  beats_ = beats;
+  one_beat_ = one_beat;
 }
 
-void
-Audio_item::do_print () const
+Audio_text::Audio_text (Audio_text::Type type, String text_string)
 {
-#ifndef NPRINT
-  if (audio_column_l_)
-    {
-      DOUT << "at: "<< audio_column_l_->at_mom ();
-    }
-#endif
+  text_string_ = text_string;
+  type_ = type;
 }