X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fmidi-item.hh;h=ae5d0998b81fd5105e13b62a84a3098cac6a61f0;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=ba3f2c0a9a61e0b76bc0dc438626ce0eae82b006;hpb=9f3572d98bb948c9689cd1f75401a029451fa001;p=lilypond.git

diff --git a/lily/include/midi-item.hh b/lily/include/midi-item.hh
index ba3f2c0a9a..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--2006 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2008 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #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,44 +25,18 @@ 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;
-
-  int channel_;
-};
-
-/**
-   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
-*/
-class Midi_chunk : public Midi_item
+class Midi_channel_item : 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_;
+  int channel_;
+  DECLARE_CLASSNAME(Midi_channel_item);
+  Midi_channel_item ();
 };
 
 class Midi_duration : public Midi_item
@@ -72,18 +48,11 @@ 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
 */
-class Midi_instrument : public Midi_item
+class Midi_instrument : public Midi_channel_item
 {
 public:
   Midi_instrument (Audio_instrument *);
@@ -117,29 +86,23 @@ public:
   int clocks_per_1_;
 };
 
-/**
-   Turn a note on.
-*/
-class Midi_note : public Midi_item
+class Midi_note : public Midi_channel_item
 {
 public:
   Midi_note (Audio_note *);
   DECLARE_CLASSNAME(Midi_note);
 
-  Moment get_length () const;
-  int get_pitch () const;
+  int get_semitone_pitch () const;
   int get_fine_tuning () const;
   virtual string to_string () const;
 
   Audio_note *audio_;
 
-  static int const c0_pitch_i_ = 60;
+  
+  static int const c0_pitch_ = 60;
   Byte dynamic_byte_;
 };
 
-/**
-   Turn a note off
-*/
 class Midi_note_off : public Midi_note
 {
 public:
@@ -169,7 +132,7 @@ public:
   Audio_text *audio_;
 };
 
-class Midi_dynamic : public Midi_item
+class Midi_dynamic : public Midi_channel_item
 {
 public:
   Midi_dynamic (Audio_dynamic *);
@@ -180,7 +143,7 @@ public:
   Audio_dynamic *audio_;
 };
 
-class Midi_piano_pedal : public Midi_item
+class Midi_piano_pedal : public Midi_channel_item
 {
 public:
   Midi_piano_pedal (Audio_piano_pedal *);
@@ -202,22 +165,6 @@ public:
   Audio_tempo *audio_;
 };
 
-class Midi_track : public Midi_chunk
-{
-public:
-  int number_;
-  DECLARE_CLASSNAME(Midi_track);
-
-  /*
-    Compensate for starting grace notes.
-  */
-  vector<Midi_event*> events_;
-
-  Midi_track ();
-  ~Midi_track ();
 
-  void add (Moment delta_time_mom, Midi_item *midi);
-  virtual string data_string () const;
-};
 
 #endif // MIDI_ITEM_HH