X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fmidi-chunk.hh;h=d73b6af790fd17b0e21f767c45e0581980de7c1c;hb=32a34dcef0c0041c6d62677487a380b5c8b85712;hp=ecd2fe260645012630d1804e0a6e0e4746155180;hpb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;p=lilypond.git diff --git a/lily/include/midi-chunk.hh b/lily/include/midi-chunk.hh index ecd2fe2606..d73b6af790 100644 --- a/lily/include/midi-chunk.hh +++ b/lily/include/midi-chunk.hh @@ -1,10 +1,20 @@ -/* - midi-chunk.hh -- declare Midi_chunk - - source file of the GNU LilyPond music typesetter - - (c) 2007--2008 Han-Wen Nienhuys - +/* + This file is part of LilyPond, the GNU music typesetter. + + 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 + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + LilyPond is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . */ #ifndef MIDI_CHUNK_HH @@ -14,7 +24,6 @@ #include "virtual-methods.hh" #include "std-vector.hh" - /** timed MIDI event */ @@ -28,9 +37,6 @@ public: string to_string () const; }; - - - /** variable sized MIDI data */ @@ -40,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_; @@ -51,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); }; @@ -60,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);