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 9bec2b4aa2afe7b92f3ee364d75e20f295f53ea2..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--2010 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.
 
@@ -33,23 +33,37 @@ string int2midi_varint_string (int i);
 class Midi_item
 {
 public:
-  DECLARE_CLASSNAME(Midi_item);
+  DECLARE_CLASSNAME (Midi_item);
   Midi_item ();
   virtual ~Midi_item ();
   virtual char const *name () const;
 
   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 ();
+  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
@@ -61,7 +75,6 @@ public:
   Real seconds_;
 };
 
-
 /**
    Change instrument event
 */
@@ -70,7 +83,7 @@ class Midi_instrument : public Midi_channel_item
 public:
   Midi_instrument (Audio_instrument *);
 
-  DECLARE_CLASSNAME(Midi_instrument);
+  DECLARE_CLASSNAME (Midi_instrument);
   virtual string to_string () const;
 
   Audio_instrument *audio_;
@@ -80,7 +93,7 @@ class Midi_key : public Midi_item
 {
 public:
   Midi_key (Audio_key *);
-  DECLARE_CLASSNAME(Midi_key);
+  DECLARE_CLASSNAME (Midi_key);
 
   virtual string to_string () const;
 
@@ -91,7 +104,7 @@ class Midi_time_signature : public Midi_item
 {
 public:
   Midi_time_signature (Audio_time_signature *);
-  DECLARE_CLASSNAME(Midi_time_signature);
+  DECLARE_CLASSNAME (Midi_time_signature);
 
   virtual string to_string () const;
 
@@ -103,7 +116,7 @@ class Midi_note : public Midi_channel_item
 {
 public:
   Midi_note (Audio_note *);
-  DECLARE_CLASSNAME(Midi_note);
+  DECLARE_CLASSNAME (Midi_note);
 
   int get_semitone_pitch () const;
   int get_fine_tuning () const;
@@ -111,7 +124,6 @@ public:
 
   Audio_note *audio_;
 
-  
   static int const c0_pitch_ = 60;
   Byte dynamic_byte_;
 };
@@ -120,7 +132,7 @@ class Midi_note_off : public Midi_note
 {
 public:
   Midi_note_off (Midi_note *);
-  DECLARE_CLASSNAME(Midi_note_off);
+  DECLARE_CLASSNAME (Midi_note_off);
 
   virtual string to_string () const;
 
@@ -132,11 +144,11 @@ class Midi_text : public Midi_item
 {
 public:
   enum Type
-    {
-      TEXT = 1, COPYRIGHT, TRACK_NAME, INSTRUMENT_NAME, LYRIC,
-      MARKER, CUE_POINT
-    };
-  DECLARE_CLASSNAME(Midi_text);
+  {
+    TEXT = 1, COPYRIGHT, TRACK_NAME, INSTRUMENT_NAME, LYRIC,
+    MARKER, CUE_POINT
+  };
+  DECLARE_CLASSNAME (Midi_text);
 
   Midi_text (Audio_text *);
 
@@ -149,7 +161,7 @@ class Midi_dynamic : public Midi_channel_item
 {
 public:
   Midi_dynamic (Audio_dynamic *);
-  DECLARE_CLASSNAME(Midi_dynamic);
+  DECLARE_CLASSNAME (Midi_dynamic);
 
   virtual string to_string () const;
 
@@ -160,7 +172,7 @@ class Midi_piano_pedal : public Midi_channel_item
 {
 public:
   Midi_piano_pedal (Audio_piano_pedal *);
-  DECLARE_CLASSNAME(Midi_piano_pedal);
+  DECLARE_CLASSNAME (Midi_piano_pedal);
 
   virtual string to_string () const;
 
@@ -171,13 +183,11 @@ class Midi_tempo : public Midi_item
 {
 public:
   Midi_tempo (Audio_tempo *);
-  DECLARE_CLASSNAME(Midi_tempo);
+  DECLARE_CLASSNAME (Midi_tempo);
 
   virtual string to_string () const;
 
   Audio_tempo *audio_;
 };
 
-
-
 #endif // MIDI_ITEM_HH