X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fmidi-chunk.hh;h=d73b6af790fd17b0e21f767c45e0581980de7c1c;hb=3ea291c21ce16aeaf00b6a6f500bf0a3a9b790d9;hp=85801173da08435cb446ee5d650705ce5fc8da46;hpb=e18531db1f79fb685fbd16d6a2a67bf4b6c09915;p=lilypond.git diff --git a/lily/include/midi-chunk.hh b/lily/include/midi-chunk.hh index 85801173da..d73b6af790 100644 --- a/lily/include/midi-chunk.hh +++ b/lily/include/midi-chunk.hh @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 2007--2010 Han-Wen Nienhuys + Copyright (C) 2007--2012 Han-Wen Nienhuys 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,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 events_; + vector events_; - Midi_track (); + Midi_track (int number, bool port); ~Midi_track (); void add (int, Midi_item *midi);