Merge branch 'jneeman' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond into jneeman

[lilypond.git] / lily / include / audio-item.hh

diff --git a/lily/include/audio-item.hh b/lily/include/audio-item.hh
index cfcbe4034e20fca25417297537a1f0c2c6856228..11f3cd31f5b90f2211578e0ed5f80c44968f415b 100644 (file)
--- a/lily/include/audio-item.hh
+++ b/lily/include/audio-item.hh
@@ -47,15 +47,15 @@ public:
 class Audio_instrument : public Audio_item
 {
 public:
-  Audio_instrument (String instrument_string);
+  Audio_instrument (string instrument_string);
 
-  String str_;
+  string str_;
 };
 
 class Audio_note : public Audio_item
 {
 public:
-  Audio_note (Pitch p, Moment m, int transposing_i = 0);
+  Audio_note (Pitch p, Moment m, bool tie_event, int transposing_i);
 
   void tie_to (Audio_note *);
 
@@ -63,12 +63,13 @@ public:
   Moment length_mom_;
   int transposing_;
   Audio_note *tied_;
+  bool tie_event_;
 };
 
 class Audio_piano_pedal : public Audio_item
 {
 public:
-  String type_string_;
+  string type_string_;
   Direction dir_;
 };
 
@@ -81,10 +82,10 @@ public:
       MARKER, CUE_POINT
     };
 
-  Audio_text (Audio_text::Type type, String text_string);
+  Audio_text (Audio_text::Type type, string text_string);
 
   Type type_;
-  String text_string_;
+  string text_string_;
 };
 
 class Audio_tempo : public Audio_item