Fix some bugs in the dynamic engraver and PostScript backend

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

diff --git a/lily/include/midi-item.hh b/lily/include/midi-item.hh
index 6ec530f68cfd0d1a4dd85ce495618a2f13ade476..ba3f2c0a9a61e0b76bc0dc438626ce0eae82b006 100644 (file)
--- a/lily/include/midi-item.hh
+++ b/lily/include/midi-item.hh
@@ -29,16 +29,8 @@ public:
   static string i2varint_string (int i);
 
   virtual string to_string () const = 0;
-};
 
-class Midi_channel_item : public Midi_item
-{
-public:
   int channel_;
-  DECLARE_CLASSNAME(Midi_channel_item);
-  Midi_channel_item ();
-  virtual const char *name () const { return "Midi_channel_item"; }
-  virtual ~Midi_channel_item ();
 };
 
 /**
@@ -91,7 +83,7 @@ public:
 /**
    Change instrument event
 */
-class Midi_instrument : public Midi_channel_item
+class Midi_instrument : public Midi_item
 {
 public:
   Midi_instrument (Audio_instrument *);
@@ -128,7 +120,7 @@ public:
 /**
    Turn a note on.
 */
-class Midi_note : public Midi_channel_item
+class Midi_note : public Midi_item
 {
 public:
   Midi_note (Audio_note *);
@@ -141,8 +133,7 @@ public:
 
   Audio_note *audio_;
 
-  
-  static int const c0_pitch_ = 60;
+  static int const c0_pitch_i_ = 60;
   Byte dynamic_byte_;
 };
 
@@ -178,7 +169,7 @@ public:
   Audio_text *audio_;
 };
 
-class Midi_dynamic : public Midi_channel_item
+class Midi_dynamic : public Midi_item
 {
 public:
   Midi_dynamic (Audio_dynamic *);
@@ -189,7 +180,7 @@ public:
   Audio_dynamic *audio_;
 };
 
-class Midi_piano_pedal : public Midi_channel_item
+class Midi_piano_pedal : public Midi_item
 {
 public:
   Midi_piano_pedal (Audio_piano_pedal *);