* lily/page-turn-engraver.cc (breakable_column): remove an always-true

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

diff --git a/lily/audio-item.cc b/lily/audio-item.cc
index 3cf2300827ebda38c1d0f868ce05eea3b1efb536..fe8c5539e1c6e593a339553132a0abbd889e7277 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--2004 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2006 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "audio-item.hh"
@@ -11,7 +11,7 @@
 #include "midi-item.hh"
 #include "audio-column.hh"
 
-Audio_instrument::Audio_instrument (String instrument_string)
+Audio_instrument::Audio_instrument (string instrument_string)
 {
   str_ = instrument_string;
 }
@@ -21,30 +21,30 @@ Audio_item::Audio_item ()
   audio_column_ = 0;
 }
 
-Audio_note::Audio_note (Pitch p, Moment m, int transposing_i)
+Audio_note::Audio_note (Pitch p, Moment m, bool tie_event, int transposing_i)
 {
   pitch_ = p;
   length_mom_ = m;
   tied_ = 0;
   transposing_ = transposing_i;
+  tie_event_ = tie_event;
 }
 
 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 (int acc, bool major)
 {
-  accidentals_=acc;
-  major_=major;
+  accidentals_ = acc;
+  major_ = major;
 }
 
 Audio_dynamic::Audio_dynamic (Real volume)
@@ -63,7 +63,7 @@ Audio_time_signature::Audio_time_signature (int beats, int one_beat)
   one_beat_ = one_beat;
 }
 
-Audio_text::Audio_text (Audio_text::Type type, String text_string)
+Audio_text::Audio_text (Audio_text::Type type, string text_string)
 {
   text_string_ = text_string;
   type_ = type;