X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Faudio-item.hh;h=11f3cd31f5b90f2211578e0ed5f80c44968f415b;hb=023604318fe8e1ec89eb9c9e222e0dd21f103d18;hp=c5063b09667155b74e707cb851f3b818fead5b51;hpb=2745cbd907f8216a4cc1fc5f488ae19efdfdbd10;p=lilypond.git

diff --git a/lily/include/audio-item.hh b/lily/include/audio-item.hh
index c5063b0966..11f3cd31f5 100644
--- a/lily/include/audio-item.hh
+++ b/lily/include/audio-item.hh
@@ -1,37 +1,30 @@
 /*
   audio-item.hh -- declare Audio_items
 
-  (c)  1996--2003 Jan Nieuwenhuizen <janneke@gnu.org>
- */
+  (c) 1996--2006 Jan Nieuwenhuizen <janneke@gnu.org>
+*/
 
 #ifndef AUDIO_ITEM_HH
 #define AUDIO_ITEM_HH
 
-#include <typeinfo>
-#include "lily-proto.hh"
-#include "string.hh"
 #include "audio-element.hh"
-
-#include "pitch.hh"
 #include "moment.hh"
-#include "drul-array.hh"
+#include "pitch.hh"
 
 /**
-   
-  Any piece of audio information.  We need virtual constructors, let's
-  try decentralised factory for specific audio implemenations.
- */
+
+Any piece of audio information.  We need virtual constructors, let's
+try decentralised factory for specific audio implemenations.
+*/
 class Audio_item : public Audio_element
 {
 public:
   Audio_item ();
+  Audio_column *audio_column_;
 
-  Audio_column* audio_column_;
-
-  
 private:
-  Audio_item (Audio_item const&);
-  Audio_item& operator= ( Audio_item const&);
+  Audio_item (Audio_item const &);
+  Audio_item &operator = (Audio_item const &);
 };
 
 class Audio_dynamic : public Audio_item
@@ -54,45 +47,45 @@ 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);
+public:
+  Audio_note (Pitch p, Moment m, bool tie_event, int transposing_i);
 
-  void tie_to (Audio_note*);
+  void tie_to (Audio_note *);
 
   Pitch pitch_;
   Moment length_mom_;
-  Moment delayed_mom_;
-  Moment delayed_until_mom_;
   int transposing_;
-  Audio_note* tied_;
+  Audio_note *tied_;
+  bool tie_event_;
 };
 
 class Audio_piano_pedal : public Audio_item
 {
 public:
-  String type_string_;
+  string type_string_;
   Direction dir_;
 };
 
 class Audio_text : public Audio_item
 {
 public:
-  enum Type { 
-    TEXT = 1, COPYRIGHT, TRACK_NAME, INSTRUMENT_NAME, LYRIC, 
-    MARKER, CUE_POINT
-  };
-  
-  Audio_text (Audio_text::Type type, String text_string);
+  enum Type
+    {
+      TEXT = 1, COPYRIGHT, TRACK_NAME, INSTRUMENT_NAME, LYRIC,
+      MARKER, CUE_POINT
+    };
+
+  Audio_text (Audio_text::Type type, string text_string);
 
   Type type_;
-  String text_string_;
+  string text_string_;
 };
 
 class Audio_tempo : public Audio_item
@@ -103,14 +96,6 @@ public:
   int per_minute_4_;
 };
 
-class Audio_tie : public Audio_item
-{
-public:
-  Audio_tie ();
-  void set_note (Direction, Audio_note*);
-  Drul_array<Audio_note*> note_l_drul_;
-};
-
 class Audio_time_signature : public Audio_item
 {
 public: