Merge branch 'master' of /home/jcharles/GIT/Lily/. into translation

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

diff --git a/lily/include/midi-item.hh b/lily/include/midi-item.hh
index dff3f4df9b1c8738a17641b3c0f94d9157390e67..57bb2d4da22eb4d7840b0b85b0ac87d9a07a61d8 100644 (file)
--- a/lily/include/midi-item.hh
+++ b/lily/include/midi-item.hh
@@ -52,27 +52,27 @@ public:
   Midi_channel_item (Audio_item *ai);
 };
 
-/**
-   Midi control function value changes.
-*/
-class Midi_control_function_value_change : public Midi_channel_item
+class Midi_duration : public Midi_item
 {
 public:
-  DECLARE_CLASSNAME (Midi_control_function_value_change);
-  Midi_control_function_value_change (Audio_control_function_value_change *ai);
-  virtual ~Midi_control_function_value_change ();
+  Midi_duration (Real seconds_f);
+
   virtual string to_string () const;
-  Audio_control_function_value_change::Control control_;
-  Real value_;
+  Real seconds_;
 };
 
-class Midi_duration : public Midi_item
+/**
+   MIDI control change
+*/
+class Midi_control_change : public Midi_channel_item
 {
 public:
-  Midi_duration (Real seconds_f);
-
+  DECLARE_CLASSNAME (Midi_control_change);
+  Midi_control_change (Audio_control_change *ai);
+  virtual ~Midi_control_change ();
   virtual string to_string () const;
-  Real seconds_;
+
+  Audio_control_change *audio_;
 };
 
 /**