X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fmidi-item.hh;h=b593ce152739e7bf82eb904818213905cc8b7a67;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=9dd942bffcdd8b0f8f56ed7fdb5eb737dd32c5c1;hpb=a276a19dc6bd57832db3107f2f2cbb04cb4677b6;p=lilypond.git diff --git a/lily/include/midi-item.hh b/lily/include/midi-item.hh index 9dd942bffc..b593ce1527 100644 --- a/lily/include/midi-item.hh +++ b/lily/include/midi-item.hh @@ -1,7 +1,20 @@ /* - midi-item.hh -- declare Midi items + This file is part of LilyPond, the GNU music typesetter. - (c) 1997--2007 Jan Nieuwenhuizen + Copyright (C) 1997--2015 Jan Nieuwenhuizen + + 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_ITEM_HH @@ -10,6 +23,8 @@ #include "audio-item.hh" #include "std-vector.hh" +string int2midi_varint_string (int i); + /** Any piece of midi information. @@ -18,57 +33,37 @@ class Midi_item { public: - DECLARE_CLASSNAME(Midi_item); + DECLARE_CLASSNAME (Midi_item); Midi_item (); virtual ~Midi_item (); virtual char const *name () const; - /// factory static Midi_item *get_midi (Audio_item *a); - static string i2varint_string (int i); - virtual string to_string () const = 0; }; class Midi_channel_item : public Midi_item { public: - int channel_; - DECLARE_CLASSNAME(Midi_channel_item); - Midi_channel_item (); - virtual const char *name () const { return "Midi_channel_item"; } virtual ~Midi_channel_item (); + int channel_; + DECLARE_CLASSNAME (Midi_channel_item); + Midi_channel_item (Audio_item *ai); }; /** - timed MIDI event -*/ -class Midi_event -{ -public: - Midi_event (Moment delta_mom, Midi_item *midi); - - Moment delta_mom_; - Midi_item *midi_; - string to_string () const; -}; - -/** - variable sized MIDI data + Midi control function value changes. */ -class Midi_chunk : public Midi_item +class Midi_control_function_value_change : public Midi_channel_item { public: - void set (string header_string, string data_string, string footer_string); + 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; - virtual string data_string () const; - DECLARE_CLASSNAME(Midi_chunk); - -private: - string data_string_; - string footer_string_; - string header_string_; + Audio_control_function_value_change::Control control_; + Real value_; }; class Midi_duration : public Midi_item @@ -80,14 +75,6 @@ public: Real seconds_; }; -class Midi_header : public Midi_chunk -{ -public: - DECLARE_CLASSNAME(Midi_header); - - Midi_header (int format_i, int tracks_i, int clocks_per_4_i); -}; - /** Change instrument event */ @@ -96,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_; @@ -106,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; @@ -117,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; @@ -125,35 +112,27 @@ public: int clocks_per_1_; }; -/** - Turn a note on. -*/ class Midi_note : public Midi_channel_item { public: Midi_note (Audio_note *); - DECLARE_CLASSNAME(Midi_note); + DECLARE_CLASSNAME (Midi_note); - Moment get_length () const; int get_semitone_pitch () const; int get_fine_tuning () const; virtual string to_string () const; Audio_note *audio_; - static int const c0_pitch_ = 60; Byte dynamic_byte_; }; -/** - Turn a note off -*/ 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; @@ -165,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 *); @@ -182,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; @@ -193,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; @@ -204,29 +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_; }; -class Midi_track : public Midi_chunk -{ -public: - int number_; - DECLARE_CLASSNAME(Midi_track); - - /* - Compensate for starting grace notes. - */ - vector events_; - - Midi_track (); - ~Midi_track (); - - void add (Moment delta_time_mom, Midi_item *midi); - virtual string data_string () const; -}; - #endif // MIDI_ITEM_HH