Add rotation support

[lilypond.git] / lily / midi-item.cc

diff --git a/lily/midi-item.cc b/lily/midi-item.cc
index 46906cd7e99590d8949f54ef702e050df786be25..7f8edb041cec4d2fc5d6425efd5ca111c52c95ef 100644 (file)
--- a/lily/midi-item.cc
+++ b/lily/midi-item.cc
@@ -17,8 +17,6 @@
 #include "string-convert.hh"
 #include "warn.hh"
 
-#include "killing-cons.tcc"
-
 #define PITCH_WHEEL_TOP 0x3FFF
 #define PITCH_WHEEL_CENTER 0x2000
 #define PITCH_WHEEL_BOTTOM 0x0000
@@ -460,7 +458,7 @@ Midi_track::add (Moment delta_time_mom, Midi_item *midi)
   assert (delta_time_mom >= Moment (0));
 
   Midi_event *e = new Midi_event (delta_time_mom, midi);
-  event_p_list_.append (new Killing_cons<Midi_event> (e, 0));
+  events_.push_back (e);
 }
 
 string
@@ -469,9 +467,11 @@ Midi_track::data_string () const
   string str = Midi_chunk::data_string ();
   if (do_midi_debugging_global)
     str += "\n";
-  for (Cons<Midi_event> *i = event_p_list_.head_; i; i = i->next_)
+
+  for (vector<Midi_event*>::const_iterator i (events_.begin());
+       i != events_.end(); i ++)
     {
-      str += i->car_->to_string ();
+      str += (*i)->to_string ();
       if (do_midi_debugging_global)
        str += "\n";
     }
@@ -484,3 +484,8 @@ Midi_item::name () const
 {
    return this->class_name ();
 }
+
+Midi_track::~Midi_track ()
+{
+  junk_pointers (events_);
+}