Run grand-replace (issue 3765)

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

diff --git a/lily/include/midi-item.hh b/lily/include/midi-item.hh
index cc59ed0abe1c165511408dfe82d4bde628ffb940..9945be89060b34c0d1b89dd11c4db1fb13ddda08 100644 (file)
--- a/lily/include/midi-item.hh
+++ b/lily/include/midi-item.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2011 Jan Nieuwenhuizen <janneke@gnu.org>
+  Copyright (C) 1997--2014 Jan Nieuwenhuizen <janneke@gnu.org>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -24,7 +24,7 @@
 #include "std-vector.hh"
 
 string int2midi_varint_string (int i);
-  
+
 /**
    Any piece of midi information.
 
@@ -40,18 +40,32 @@ public:
 
   static Midi_item *get_midi (Audio_item *a);
 
-
   virtual string to_string () const = 0;
 };
 
 class Midi_channel_item : public Midi_item
 {
 public:
+  virtual ~Midi_channel_item ();
   int channel_;
   DECLARE_CLASSNAME (Midi_channel_item);
   Midi_channel_item (Audio_item *ai);
 };
 
+/**
+   Midi control function value changes.
+*/
+class Midi_control_function_value_change : public Midi_channel_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 ();
+  virtual string to_string () const;
+  Audio_control_function_value_change::Control control_;
+  Real value_;
+};
+
 class Midi_duration : public Midi_item
 {
 public:
@@ -61,7 +75,6 @@ public:
   Real seconds_;
 };
 
-
 /**
    Change instrument event
 */
@@ -111,7 +124,6 @@ public:
 
   Audio_note *audio_;
 
-  
   static int const c0_pitch_ = 60;
   Byte dynamic_byte_;
 };
@@ -132,10 +144,10 @@ class Midi_text : public Midi_item
 {
 public:
   enum Type
-    {
-      TEXT = 1, COPYRIGHT, TRACK_NAME, INSTRUMENT_NAME, LYRIC,
-      MARKER, CUE_POINT
-    };
+  {
+    TEXT = 1, COPYRIGHT, TRACK_NAME, INSTRUMENT_NAME, LYRIC,
+    MARKER, CUE_POINT
+  };
   DECLARE_CLASSNAME (Midi_text);
 
   Midi_text (Audio_text *);