release: 1.3.93

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

diff --git a/lily/include/audio-item.hh b/lily/include/audio-item.hh
index 9c01181055731e33127fb646eba17dba752d9871..e8ced6a64bdbc6a039be4412a8b8e5c7f0e2a099 100644 (file)
--- a/lily/include/audio-item.hh
+++ b/lily/include/audio-item.hh
@@ -7,11 +7,11 @@
 #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 "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,8 @@ public:
 class Audio_key : public Audio_item
 {
 public:
-  Audio_key (Key_def const& key);
-
-  Key_def key_;
+  Audio_key (); //Newkey_def const& key);
+  // FIXME
 };
 
 class Audio_instrument : public Audio_item
@@ -79,7 +76,8 @@ public:
 class Audio_piano_pedal : public Audio_item
 {
 public:
-  bool type_b_;
+  String type_str_;
+  Direction dir_;
 };
 
 class Audio_text : public Audio_item