X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fmidi-item.hh;h=ae5d0998b81fd5105e13b62a84a3098cac6a61f0;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=f7ea0e0585c07cce1551692ef714b1b78660bb7d;hpb=e3f5de04521f1b0e1320987caf2c7d755280d16f;p=lilypond.git diff --git a/lily/include/midi-item.hh b/lily/include/midi-item.hh index f7ea0e0585..ae5d0998b8 100644 --- a/lily/include/midi-item.hh +++ b/lily/include/midi-item.hh @@ -1,7 +1,7 @@ /* midi-item.hh -- declare Midi items - (c) 1997--2007 Jan Nieuwenhuizen + (c) 1997--2008 Jan Nieuwenhuizen */ #ifndef MIDI_ITEM_HH @@ -10,6 +10,8 @@ #include "audio-item.hh" #include "std-vector.hh" +string int2midi_varint_string (int i); + /** Any piece of midi information. @@ -23,10 +25,8 @@ public: 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; }; @@ -39,36 +39,6 @@ public: Midi_channel_item (); }; -/** - timed MIDI event -*/ -class Midi_event -{ -public: - Midi_event (int delta, Midi_item *midi); - - int delta_ticks_; - Midi_item *midi_; - string to_string () const; -}; - -/** - variable sized MIDI data -*/ -class Midi_chunk : public Midi_item -{ -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); - -private: - string data_string_; - string footer_string_; - string header_string_; -}; - class Midi_duration : public Midi_item { public: @@ -78,13 +48,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 @@ -202,19 +165,6 @@ public: Audio_tempo *audio_; }; -class Midi_track : public Midi_chunk -{ -public: - int number_; - DECLARE_CLASSNAME(Midi_track); - - vector events_; - - Midi_track (); - ~Midi_track (); - void add (int, Midi_item *midi); - virtual string data_string () const; -}; #endif // MIDI_ITEM_HH