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 1c0dac33d34486395fbe5df0b62b51c3ac3310bb..e8ced6a64bdbc6a039be4412a8b8e5c7f0e2a099 100644 (file)
--- a/lily/include/audio-item.hh
+++ b/lily/include/audio-item.hh
@@ -1,16 +1,17 @@
 /*
   audio-item.hh -- declare Audio_items
 
-  (c) 1996,  1997--1999 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1996--2000 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 "key-def.hh"
+
 #include "musical-pitch.hh"
 #include "moment.hh"
 #include "drul-array.hh"
@@ -28,20 +29,25 @@ public:
 
   Audio_column* audio_column_l_;
 
-protected:
-  virtual void do_print () const;
   
 private:
   Audio_item (Audio_item const&);
   Audio_item& operator=( Audio_item const&);
 };
 
-class Audio_key : public Audio_item
+class Audio_dynamic : public Audio_item
 {
 public:
-  Audio_key (Key_def const& key);
+  Audio_dynamic (Real volume);
 
-  Key_def key_;
+  Real volume_;
+};
+
+class Audio_key : public Audio_item
+{
+public:
+  Audio_key (); //Newkey_def const& key);
+  // FIXME
 };
 
 class Audio_instrument : public Audio_item
@@ -67,6 +73,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: