Message-handling: Make the Input class use the functions in warn.cc

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

diff --git a/lily/include/midi-chunk.hh b/lily/include/midi-chunk.hh
index abf409ef2d62cfc11a970e6283c712b020de819e..77ea97a78d90ce4d8c630647349b1b55d1b65286 100644 (file)
--- a/lily/include/midi-chunk.hh
+++ b/lily/include/midi-chunk.hh
@@ -24,7 +24,6 @@
 #include "virtual-methods.hh"
 #include "std-vector.hh"
 
-
 /**
    timed MIDI event
 */
@@ -38,9 +37,6 @@ public:
   string to_string () const;
 };
 
-
-
-
 /**
    variable sized MIDI data
 */
@@ -50,7 +46,7 @@ public:
   void set (string header_string, string data_string, string footer_string);
   virtual string to_string () const;
   virtual string data_string () const;
-  DECLARE_CLASSNAME(Midi_chunk);
+  DECLARE_CLASSNAME (Midi_chunk);
   virtual ~Midi_chunk ();
 private:
   string data_string_;
@@ -61,7 +57,7 @@ private:
 class Midi_header : public Midi_chunk
 {
 public:
-  DECLARE_CLASSNAME(Midi_header);
+  DECLARE_CLASSNAME (Midi_header);
 
   Midi_header (int format, int tracks, int clocks_per_4);
 };
@@ -70,11 +66,12 @@ class Midi_track : public Midi_chunk
 {
 public:
   int number_;
-  DECLARE_CLASSNAME(Midi_track);
+  int port_;
+  DECLARE_CLASSNAME (Midi_track);
 
-  vector<Midi_event*> events_;
+  vector<Midi_event *> events_;
 
-  Midi_track ();
+  Midi_track (int number, bool port);
   ~Midi_track ();
 
   void add (int, Midi_item *midi);