release: 1.3.134

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

diff --git a/lily/include/audio-item.hh b/lily/include/audio-item.hh
index 9b59283804b7aadf1f175db801a36b611b265f90..66246a074a2e65aa4e1466ed81b914913ab941fa 100644 (file)
--- a/lily/include/audio-item.hh
+++ b/lily/include/audio-item.hh
@@ -1,18 +1,18 @@
 /*
   audio-item.hh -- declare Audio_items
 
-  (c) 1996--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1996--2001 Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
 #ifndef AUDIO_ITEM_HH
 #define AUDIO_ITEM_HH
 
- #include <typeinfo>
+#include <typeinfo>
 #include "lily-proto.hh"
 #include "string.hh"
 #include "audio-element.hh"
-#include "key-def.hh"
-#include "musical-pitch.hh"
+
+#include "pitch.hh"
 #include "moment.hh"
 #include "drul-array.hh"
 
@@ -29,8 +29,6 @@ public:
 
   Audio_column* audio_column_l_;
 
-protected:
-  virtual void do_print () const;
   
 private:
   Audio_item (Audio_item const&);
@@ -48,9 +46,10 @@ public:
 class Audio_key : public Audio_item
 {
 public:
-  Audio_key (Key_def const& key);
+  Audio_key (int acc, bool major);
 
-  Key_def key_;
+  int accidentals_;
+  bool major_;
 };
 
 class Audio_instrument : public Audio_item
@@ -64,11 +63,11 @@ public:
 class Audio_note : public Audio_item
 {
 public:  
-  Audio_note (Musical_pitch p, Moment m, int transposing_i = 0);
+  Audio_note (Pitch p, Moment m, int transposing_i = 0);
 
   void tie_to (Audio_note*);
 
-  Musical_pitch pitch_;
+  Pitch pitch_;
   Moment length_mom_;
   Moment delayed_mom_;
   Moment delayed_until_mom_;
@@ -76,6 +75,13 @@ public:
   Audio_note* tied_;
 };
 
+class Audio_piano_pedal : public Audio_item
+{
+public:
+  String type_str_;
+  Direction dir_;
+};
+
 class Audio_text : public Audio_item
 {
 public: