release: 1.3.92

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

diff --git a/lily/audio-item.cc b/lily/audio-item.cc
index 689c34af3851cebc7e5f87fe7ed7e8a79e4ff0f0..4e771ca08e23aaadfbd3ac325971a3333e1d345e 100644 (file)
--- a/lily/audio-item.cc
+++ b/lily/audio-item.cc
@@ -3,82 +3,94 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Jan Nieuwenhuizen <jan@digicash.com>
+  (c)  1997--2000 Jan Nieuwenhuizen <janneke@gnu.org>
 */
-
+#include "debug.hh"
 #include "audio-item.hh"
 #include "midi-item.hh"
+#include "audio-column.hh"
 
-#if 0
-Audio_instrument::Audio_instrument( String instrument_str )
-       : Audio_item( 0 )
+Audio_instrument::Audio_instrument (String instrument_str)
 {
+  str_ = instrument_str;
 }
-#endif
-                                      
-Audio_item::Audio_item( Request* req_l )
+
+Audio_item::Audio_item ()
 {
-    audio_column_l_ = 0;
-    req_l_ = req_l;
+  audio_column_l_ = 0;
 }
 
-Audio_key::Audio_key( Request* req_l )
-       : Audio_item( req_l )
+Audio_note::Audio_note (Musical_pitch p, Moment m, int transposing_i)
 {
+  pitch_ = p;
+  length_mom_ = m;
+  tied_ = 0;
+  transposing_i_ = transposing_i;
 }
 
-Midi_item*
-Audio_key::midi_item_p()
+void
+Audio_note::tie_to (Audio_note* t)
 {
-    return new Midi_key( this );
+  tied_ = t;
+  Audio_note* first = t;
+  while (first->tied_)
+    first = first->tied_;
+  first->length_mom_ += length_mom_;
+  length_mom_ = 0;
 }
 
-
-Audio_note::Audio_note( Request* req_l, bool on_b )
-       : Audio_item( req_l )
+                   
+Audio_key::Audio_key () // Key_def const& k)
 {
-    on_b_ = on_b;
+  //fixme.
 }
 
-Midi_item*
-Audio_note::midi_item_p()
+Audio_dynamic::Audio_dynamic (Real volume)
 {
-    return new Midi_note( this );
+  volume_ = volume;
 }
 
-Audio_tempo::Audio_tempo( int per_minute_4_i )
-       : Audio_item( 0 )
+Audio_tempo::Audio_tempo (int per_minute_4_i)
 {
-    per_minute_4_i_ = per_minute_4_i;
+  per_minute_4_i_ = per_minute_4_i;
 }
 
-Midi_item*
-Audio_tempo::midi_item_p()
+Audio_time_signature::Audio_time_signature (int beats, int one_beat)
 {
-    return new Midi_tempo( this );
+  beats_i_ = beats;
+  one_beat_i_ = one_beat;
 }
 
-Audio_meter::Audio_meter( Request* req_l )
-       : Audio_item( req_l )
+Audio_text::Audio_text (Audio_text::Type type, String text_str)
 {
+  text_str_ = text_str;
+  type_ = type;
 }
 
-Midi_item*
-Audio_meter::midi_item_p()
+Audio_tie::Audio_tie ()
 {
-    return new Midi_meter( this );
+  note_l_drul_[RIGHT] = 0;
+  note_l_drul_[LEFT] = 0;
 }
 
-Audio_text::Audio_text( Audio_text::Type type, String text_str )
-       : Audio_item( 0 )
+void
+Audio_tie::set_note (Direction d, Audio_note* note_l)
 {
-       text_str_ = text_str;
-       type_ = type;
+  assert (!note_l_drul_[d]);
+  note_l_drul_[d] = note_l;
+  //set_bound (d, head_l);
+
+  //  add_dependency (head_l);
 }
 
-Midi_item*
-Audio_text::midi_item_p()
+void
+Audio_item::do_print () const
 {
-    return new Midi_text( this );
+#ifndef NPRINT
+  if (audio_column_l_)
+    {
+      DEBUG_OUT << "at: "<< audio_column_l_->at_mom ();
+    }
+#endif
 }