Fix some bugs in the dynamic engraver and PostScript backend

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

diff --git a/lily/midi-item.cc b/lily/midi-item.cc
index 23ab0b614f333a07f6f8cc47a38826547409b358..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
@@ -52,25 +50,25 @@ Midi_item::get_midi (Audio_item *a)
 }
 
 void
-Midi_chunk::set (std::string header_string, std::string data_string, std::string footer_string)
+Midi_chunk::set (string header_string, string data_string, string footer_string)
 {
   data_string_ = data_string;
   footer_string_ = footer_string;
   header_string_ = header_string;
 }
 
-std::string
+string
 Midi_chunk::data_string () const
 {
   return data_string_;
 }
 
-std::string
+string
 Midi_chunk::to_string () const
 {
-  std::string str = header_string_;
-  std::string dat = data_string ();
-  std::string length_string = String_convert::int2hex (dat.length ()
+  string str = header_string_;
+  string dat = data_string ();
+  string length_string = String_convert::int2hex (dat.length ()
                                                  + footer_string_.length (), 8, '0');
   length_string = String_convert::hex2bin (length_string);
 
@@ -86,10 +84,10 @@ Midi_duration::Midi_duration (Real seconds_f)
   seconds_ = seconds_f;
 }
 
-std::string
+string
 Midi_duration::to_string () const
 {
-  return std::string ("<duration: ") + std::to_string (seconds_) + ">";
+  return string ("<duration: ") + ::to_string (seconds_) + ">";
 }
 
 Midi_event::Midi_event (Moment delta_mom, Midi_item *midi)
@@ -101,30 +99,30 @@ Midi_event::Midi_event (Moment delta_mom, Midi_item *midi)
 /*
   ugh. midi output badly broken since grace note hackage.
 */
-std::string
+string
 Midi_event::to_string () const
 {
   Rational rat_dt = (delta_mom_.main_part_ * Rational (384)
                     + delta_mom_.grace_part_ * Rational (100)) * Rational (4);
   int delta_i = rat_dt.to_int ();
 
-  std::string delta_string = Midi_item::i2varint_string (delta_i);
-  std::string midi_string = midi_->to_string ();
+  string delta_string = Midi_item::i2varint_string (delta_i);
+  string midi_string = midi_->to_string ();
   assert (midi_string.length ());
   return delta_string + midi_string;
 }
 
 Midi_header::Midi_header (int format_i, int tracks_i, int clocks_per_4_i)
 {
-  std::string str;
+  string str;
 
-  std::string format_string = String_convert::int2hex (format_i, 4, '0');
+  string format_string = String_convert::int2hex (format_i, 4, '0');
   str += String_convert::hex2bin (format_string);
 
-  std::string tracks_string = String_convert::int2hex (tracks_i, 4, '0');
+  string tracks_string = String_convert::int2hex (tracks_i, 4, '0');
   str += String_convert::hex2bin (tracks_string);
 
-  std::string tempo_string = String_convert::int2hex (clocks_per_4_i, 4, '0');
+  string tempo_string = String_convert::int2hex (clocks_per_4_i, 4, '0');
   str += String_convert::hex2bin (tempo_string);
 
   set ("MThd", str, "");
@@ -136,7 +134,7 @@ Midi_instrument::Midi_instrument (Audio_instrument *a)
   audio_->str_ = String_convert::to_lower (audio_->str_);
 }
 
-std::string
+string
 Midi_instrument::to_string () const
 {
   Byte program_byte = 0;
@@ -153,8 +151,8 @@ Midi_instrument::to_string () const
   else
     warning (_f ("no such MIDI instrument: `%s'", audio_->str_.c_str ()));
 
-  std::string str = std::to_string ((char) (0xc0 + channel_)); //YIKES! FIXME : Should be track. -rz
-  str += std::to_string ((char)program_byte);
+  string str = ::to_string ((char) (0xc0 + channel_)); //YIKES! FIXME : Should be track. -rz
+  str += ::to_string ((char)program_byte);
   return str;
 }
 
@@ -167,7 +165,7 @@ Midi_item::~Midi_item ()
 {
 }
 
-std::string
+string
 Midi_item::i2varint_string (int i)
 {
   int buffer_i = i & 0x7f;
@@ -178,10 +176,10 @@ Midi_item::i2varint_string (int i)
       buffer_i += (i & 0x7f);
     }
 
-  std::string str;
+  string str;
   while (1)
     {
-      str += std::to_string ((char)buffer_i);
+      str += ::to_string ((char)buffer_i);
       if (buffer_i & 0x80)
        buffer_i >>= 8;
       else
@@ -195,10 +193,10 @@ Midi_key::Midi_key (Audio_key *a)
   audio_ = a;
 }
 
-std::string
+string
 Midi_key::to_string () const
 {
-  std::string str = "ff5902";
+  string str = "ff5902";
   str += String_convert::int2hex (audio_->accidentals_, 2, '0');
   if (audio_->major_)
     str += String_convert::int2hex (0, 2, '0');
@@ -213,7 +211,7 @@ Midi_time_signature::Midi_time_signature (Audio_time_signature *a)
   clocks_per_1_ = 18;
 }
 
-std::string
+string
 Midi_time_signature::to_string () const
 {
   int num = abs (audio_->beats_);
@@ -227,7 +225,7 @@ Midi_time_signature::to_string () const
 
 
   
-  std::string str = "ff5804";
+  string str = "ff5804";
   str += String_convert::int2hex (num, 2, '0');
   str += String_convert::int2hex (intlog2 (den), 2, '0');
   str += String_convert::int2hex (clocks_per_1_, 2, '0');
@@ -269,11 +267,11 @@ Midi_note::get_pitch () const
   return p;
 }
 
-std::string
+string
 Midi_note::to_string () const
 {
   Byte status_byte = (char) (0x90 + channel_);
-  std::string str = "";
+  string str = "";
   int finetune;
 
   // print warning if fine tuning was needed, HJJ
@@ -287,15 +285,15 @@ Midi_note::to_string () const
       // The pitch wheel range (of 4 semitones) is multiplied by the cents.
       finetune += (PITCH_WHEEL_RANGE *get_fine_tuning ()) / (4 * 100);
 
-      str += std::to_string ((char) (0xE0 + channel_));
-      str += std::to_string ((char) (finetune & 0x7F));
-      str += std::to_string ((char) (finetune >> 7));
-      str += std::to_string ((char) (0x00));
+      str += ::to_string ((char) (0xE0 + channel_));
+      str += ::to_string ((char) (finetune & 0x7F));
+      str += ::to_string ((char) (finetune >> 7));
+      str += ::to_string ((char) (0x00));
     }
 
-  str += std::to_string ((char)status_byte);
-  str += std::to_string ((char) (get_pitch () + c0_pitch_i_));
-  str += std::to_string ((char)dynamic_byte_);
+  str += ::to_string ((char)status_byte);
+  str += ::to_string ((char) (get_pitch () + c0_pitch_i_));
+  str += ::to_string ((char)dynamic_byte_);
 
   return str;
 }
@@ -313,22 +311,22 @@ Midi_note_off::Midi_note_off (Midi_note *n)
   aftertouch_byte_ = 64;
 }
 
-std::string
+string
 Midi_note_off::to_string () const
 {
   Byte status_byte = (char) (0x80 + channel_);
 
-  std::string str = std::to_string ((char)status_byte);
-  str += std::to_string ((char) (get_pitch () + Midi_note::c0_pitch_i_));
-  str += std::to_string ((char)aftertouch_byte_);
+  string str = ::to_string ((char)status_byte);
+  str += ::to_string ((char) (get_pitch () + Midi_note::c0_pitch_i_));
+  str += ::to_string ((char)aftertouch_byte_);
 
   if (get_fine_tuning () != 0)
     {
       // Move pitch wheel back to the central position.
-      str += std::to_string ((char) 0x00);
-      str += std::to_string ((char) (0xE0 + channel_));
-      str += std::to_string ((char) (PITCH_WHEEL_CENTER &0x7F));
-      str += std::to_string ((char) (PITCH_WHEEL_CENTER >> 7));
+      str += ::to_string ((char) 0x00);
+      str += ::to_string ((char) (0xE0 + channel_));
+      str += ::to_string ((char) (PITCH_WHEEL_CENTER &0x7F));
+      str += ::to_string ((char) (PITCH_WHEEL_CENTER >> 7));
     }
 
   return str;
@@ -339,11 +337,11 @@ Midi_dynamic::Midi_dynamic (Audio_dynamic *a)
   audio_ = a;
 }
 
-std::string
+string
 Midi_dynamic::to_string () const
 {
   Byte status_byte = (char) (0xB0 + channel_);
-  std::string str = std::to_string ((char)status_byte);
+  string str = ::to_string ((char)status_byte);
 
   /*
     Main volume controller (per channel):
@@ -358,8 +356,8 @@ Midi_dynamic::to_string () const
   if (volume > full_scale)
     volume = (int)full_scale;
 
-  str += std::to_string ((char)0x07);
-  str += std::to_string ((char)volume);
+  str += ::to_string ((char)0x07);
+  str += ::to_string ((char)volume);
   return str;
 }
 
@@ -368,21 +366,21 @@ Midi_piano_pedal::Midi_piano_pedal (Audio_piano_pedal *a)
   audio_ = a;
 }
 
-std::string
+string
 Midi_piano_pedal::to_string () const
 {
   Byte status_byte = (char) (0xB0 + channel_);
-  std::string str = std::to_string ((char)status_byte);
+  string str = ::to_string ((char)status_byte);
 
   if (audio_->type_string_ == "Sostenuto")
-    str += std::to_string ((char)0x42);
+    str += ::to_string ((char)0x42);
   else if (audio_->type_string_ == "Sustain")
-    str += std::to_string ((char)0x40);
+    str += ::to_string ((char)0x40);
   else if (audio_->type_string_ == "UnaCorda")
-    str += std::to_string ((char)0x43);
+    str += ::to_string ((char)0x43);
 
   int pedal = ((1 - audio_->dir_) / 2) * 0x7f;
-  str += std::to_string ((char)pedal);
+  str += ::to_string ((char)pedal);
   return str;
 }
 
@@ -391,11 +389,11 @@ Midi_tempo::Midi_tempo (Audio_tempo *a)
   audio_ = a;
 }
 
-std::string
+string
 Midi_tempo::to_string () const
 {
   int useconds_per_4_i = 60 * (int)1e6 / audio_->per_minute_4_;
-  std::string str = "ff5103";
+  string str = "ff5103";
   str += String_convert::int2hex (useconds_per_4_i, 6, '0');
   return String_convert::hex2bin (str);
 }
@@ -405,10 +403,10 @@ Midi_text::Midi_text (Audio_text *a)
   audio_ = a;
 }
 
-std::string
+string
 Midi_text::to_string () const
 {
-  std::string str = "ff" + String_convert::int2hex (audio_->type_, 2, '0');
+  string str = "ff" + String_convert::int2hex (audio_->type_, 2, '0');
   str = String_convert::hex2bin (str);
   str += i2varint_string (audio_->text_string_.length ());
   str += audio_->text_string_;
@@ -444,12 +442,12 @@ Midi_track::Midi_track ()
     //                           "00" "ff59" "02" "ff" "00"
     ;
 
-  std::string data_string;
+  string data_string;
   // only for format 0 (currently using format 1)?
   data_string += String_convert::hex2bin (data_str0);
 
   char const *footer_str0 = "00" "ff2f" "00";
-  std::string footer_string = String_convert::hex2bin (footer_str0);
+  string footer_string = String_convert::hex2bin (footer_str0);
 
   set ("MTrk", data_string, footer_string);
 }
@@ -460,18 +458,20 @@ 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);
 }
 
-std::string
+string
 Midi_track::data_string () const
 {
-  std::string str = Midi_chunk::data_string ();
+  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_);
+}