X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmidi-item.cc;h=3fcdb4ca223d6c7ebea4a3b6e983cfc6cab6001d;hb=e3fa24f095381f36fdc5fa17494ec16b5cd18fe8;hp=4526cc1dfb97dcc4cf383153ab8a621af9a0cc63;hpb=bdf4ab13203502e7ec7cf9cf5896527643a07c1f;p=lilypond.git

diff --git a/lily/midi-item.cc b/lily/midi-item.cc
index 4526cc1dfb..3fcdb4ca22 100644
--- a/lily/midi-item.cc
+++ b/lily/midi-item.cc
@@ -3,19 +3,19 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2006 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "midi-item.hh"
 
-#include "warn.hh"
+#include "duration.hh"
+#include "international.hh"
 #include "main.hh"
+#include "midi-stream.hh"
 #include "misc.hh"
+#include "program-option.hh"
 #include "string-convert.hh"
-#include "midi-stream.hh"
-#include "duration.hh"
-#include "scm-option.hh"
-#include "killing-cons.tcc"
+#include "warn.hh"
 
 #define PITCH_WHEEL_TOP 0x3FFF
 #define PITCH_WHEEL_CENTER 0x2000
@@ -50,30 +50,32 @@ Midi_item::get_midi (Audio_item *a)
 }
 
 void
-Midi_chunk::set (String header_string, String data_string, 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;
 }
 
-String
+string
 Midi_chunk::data_string () const
 {
   return data_string_;
 }
 
-String
+string
 Midi_chunk::to_string () const
 {
-  String str = header_string_;
-  String dat = data_string ();
-  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);
+
   str += length_string;
   str += dat;
   str += footer_string_;
+
   return str;
 }
 
@@ -82,10 +84,10 @@ Midi_duration::Midi_duration (Real seconds_f)
   seconds_ = seconds_f;
 }
 
-String
+string
 Midi_duration::to_string () const
 {
-  return String ("<duration: ") + ::to_string (seconds_) + ">";
+  return string ("<duration: ") + ::to_string (seconds_) + ">";
 }
 
 Midi_event::Midi_event (Moment delta_mom, Midi_item *midi)
@@ -97,30 +99,30 @@ Midi_event::Midi_event (Moment delta_mom, Midi_item *midi)
 /*
   ugh. midi output badly broken since grace note hackage.
 */
-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 = int (rat_dt);
+  int delta = rat_dt.to_int ();
 
-  String delta_string = Midi_item::i2varint_string (delta_i);
-  String midi_string = midi_->to_string ();
+  string delta_string = Midi_item::i2varint_string (delta);
+  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)
+Midi_header::Midi_header (int format, int tracks, int clocks_per_4)
 {
-  String str;
+  string str;
 
-  String format_string = String_convert::int2hex (format_i, 4, '0');
+  string format_string = String_convert::int2hex (format, 4, '0');
   str += String_convert::hex2bin (format_string);
-	
-  String tracks_string = String_convert::int2hex (tracks_i, 4, '0');
+
+  string tracks_string = String_convert::int2hex (tracks, 4, '0');
   str += String_convert::hex2bin (tracks_string);
 
-  String tempo_string = String_convert::int2hex (clocks_per_4_i, 4, '0');
+  string tempo_string = String_convert::int2hex (clocks_per_4, 4, '0');
   str += String_convert::hex2bin (tempo_string);
 
   set ("MThd", str, "");
@@ -129,10 +131,10 @@ Midi_header::Midi_header (int format_i, int tracks_i, int clocks_per_4_i)
 Midi_instrument::Midi_instrument (Audio_instrument *a)
 {
   audio_ = a;
-  audio_->str_.to_lower ();
+  audio_->str_ = String_convert::to_lower (audio_->str_);
 }
 
-String
+string
 Midi_instrument::to_string () const
 {
   Byte program_byte = 0;
@@ -142,19 +144,28 @@ Midi_instrument::to_string () const
     UGH. don't use eval.
   */
   SCM proc = ly_lily_module_constant ("midi-program");
-  SCM program = scm_call_1 (proc, ly_symbol2scm (audio_->str_.to_str0 ()));
+  SCM program = scm_call_1 (proc, ly_symbol2scm (audio_->str_.c_str ()));
   found = (program != SCM_BOOL_F);
   if (found)
     program_byte = scm_to_int (program);
   else
-    warning (_f ("no such MIDI instrument: `%s'", audio_->str_.to_str0 ()));
+    warning (_f ("no such MIDI instrument: `%s'", audio_->str_.c_str ()));
 
-  String str = ::to_string ((char) (0xc0 + channel_)); //YIKES! FIXME : Should be track. -rz
+  string str = ::to_string ((char) (0xc0 + channel_)); //YIKES! FIXME : Should be track. -rz
   str += ::to_string ((char)program_byte);
   return str;
 }
 
 Midi_item::Midi_item ()
+{
+}
+
+Midi_channel_item::~Midi_channel_item ()
+{
+  channel_ = 0;
+}
+
+Midi_channel_item::Midi_channel_item ()
 {
   channel_ = 0;
 }
@@ -163,23 +174,23 @@ Midi_item::~Midi_item ()
 {
 }
 
-String
+string
 Midi_item::i2varint_string (int i)
 {
-  int buffer_i = i & 0x7f;
+  int buffer = i & 0x7f;
   while ((i >>= 7) > 0)
     {
-      buffer_i <<= 8;
-      buffer_i |= 0x80;
-      buffer_i += (i & 0x7f);
+      buffer <<= 8;
+      buffer |= 0x80;
+      buffer += (i & 0x7f);
     }
 
-  String str;
+  string str;
   while (1)
     {
-      str += ::to_string ((char)buffer_i);
-      if (buffer_i & 0x80)
-	buffer_i >>= 8;
+      str += ::to_string ((char)buffer);
+      if (buffer & 0x80)
+	buffer >>= 8;
       else
 	break;
     }
@@ -191,10 +202,10 @@ Midi_key::Midi_key (Audio_key *a)
   audio_ = a;
 }
 
-String
+string
 Midi_key::to_string () const
 {
-  String str = "ff5902";
+  string str = "ff5902";
   str += String_convert::int2hex (audio_->accidentals_, 2, '0');
   if (audio_->major_)
     str += String_convert::int2hex (0, 2, '0');
@@ -203,27 +214,35 @@ Midi_key::to_string () const
   return String_convert::hex2bin (str);
 }
 
-Midi_time_signature::Midi_time_signature (Audio_time_signature* a)
+Midi_time_signature::Midi_time_signature (Audio_time_signature *a)
 {
   audio_ = a;
   clocks_per_1_ = 18;
 }
 
-String
+string
 Midi_time_signature::to_string () const
 {
-  int num = audio_->beats_;
+  int num = abs (audio_->beats_);
+  if (num > 255)
+    {
+      warning ("Time signature with more than 255 beats. Truncating");
+      num = 255;
+    }
+
   int den = audio_->one_beat_;
 
-  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 (intlog2 (den), 2, '0');
   str += String_convert::int2hex (clocks_per_1_, 2, '0');
   str += String_convert::int2hex (8, 2, '0');
   return String_convert::hex2bin (str);
 }
 
-Midi_note::Midi_note (Audio_note* a)
+Midi_note::Midi_note (Audio_note *a)
 {
   audio_ = a;
   dynamic_byte_ = 0x7f;
@@ -239,35 +258,32 @@ Midi_note::get_length () const
 int
 Midi_note::get_fine_tuning () const
 {
-  int ft = audio_->pitch_.quartertone_pitch ();
-  ft -= 2 * audio_->pitch_.semitone_pitch ();
-  ft *= 50; // 1 quarter tone = 50 cents
-  return ft;
+  Rational tune = (audio_->pitch_.tone_pitch ()
+		   + audio_->transposing_.tone_pitch ()) * Rational (2);
+  tune -= Rational (get_semitone_pitch ());
+
+  tune *= 100;
+  return (int) double (tune);
 }
 
 int
-Midi_note::get_pitch () const
+Midi_note::get_semitone_pitch () const
 {
-  int p = audio_->pitch_.semitone_pitch () + audio_->transposing_;
-  if (p == INT_MAX)
-    {
-      warning (_ ("silly pitch"));
-      p = 0;
-    }
-  return p;
+  return int (double ((audio_->pitch_.tone_pitch ()
+		       + audio_->transposing_.tone_pitch ()) * Rational (2)));
 }
 
-String
+string
 Midi_note::to_string () const
 {
   Byte status_byte = (char) (0x90 + channel_);
-  String str = "";
+  string str = "";
   int finetune;
 
   // print warning if fine tuning was needed, HJJ
   if (get_fine_tuning () != 0)
     {
-      warning (_f ("Experimental: temporarily fine tuning (of %d cents) a channel.",
+      warning (_f ("experimental: temporarily fine tuning (of %d cents) a channel.",
 		   get_fine_tuning ()));
 
       finetune = PITCH_WHEEL_CENTER;
@@ -282,7 +298,7 @@ Midi_note::to_string () const
     }
 
   str += ::to_string ((char)status_byte);
-  str += ::to_string ((char) (get_pitch () + c0_pitch_i_));
+  str += ::to_string ((char) (get_semitone_pitch () + c0_pitch_));
   str += ::to_string ((char)dynamic_byte_);
 
   return str;
@@ -301,13 +317,13 @@ Midi_note_off::Midi_note_off (Midi_note *n)
   aftertouch_byte_ = 64;
 }
 
-String
+string
 Midi_note_off::to_string () const
 {
   Byte status_byte = (char) (0x80 + channel_);
 
-  String str = ::to_string ((char)status_byte);
-  str += ::to_string ((char) (get_pitch () + Midi_note::c0_pitch_i_));
+  string str = ::to_string ((char)status_byte);
+  str += ::to_string ((char) (get_semitone_pitch () + Midi_note::c0_pitch_));
   str += ::to_string ((char)aftertouch_byte_);
 
   if (get_fine_tuning () != 0)
@@ -327,11 +343,11 @@ Midi_dynamic::Midi_dynamic (Audio_dynamic *a)
   audio_ = a;
 }
 
-String
+string
 Midi_dynamic::to_string () const
 {
   Byte status_byte = (char) (0xB0 + channel_);
-  String str = ::to_string ((char)status_byte);
+  string str = ::to_string ((char)status_byte);
 
   /*
     Main volume controller (per channel):
@@ -356,11 +372,11 @@ Midi_piano_pedal::Midi_piano_pedal (Audio_piano_pedal *a)
   audio_ = a;
 }
 
-String
+string
 Midi_piano_pedal::to_string () const
 {
   Byte status_byte = (char) (0xB0 + channel_);
-  String str = ::to_string ((char)status_byte);
+  string str = ::to_string ((char)status_byte);
 
   if (audio_->type_string_ == "Sostenuto")
     str += ::to_string ((char)0x42);
@@ -379,24 +395,24 @@ Midi_tempo::Midi_tempo (Audio_tempo *a)
   audio_ = a;
 }
 
-String
+string
 Midi_tempo::to_string () const
 {
-  int useconds_per_4_i = 60 * (int)1e6 / audio_->per_minute_4_;
-  String str = "ff5103";
-  str += String_convert::int2hex (useconds_per_4_i, 6, '0');
+  int useconds_per_4 = 60 * (int)1e6 / audio_->per_minute_4_;
+  string str = "ff5103";
+  str += String_convert::int2hex (useconds_per_4, 6, '0');
   return String_convert::hex2bin (str);
 }
 
-Midi_text::Midi_text (Audio_text* a)
+Midi_text::Midi_text (Audio_text *a)
 {
   audio_ = a;
 }
 
-String
+string
 Midi_text::to_string () const
 {
-  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_;
@@ -432,12 +448,12 @@ Midi_track::Midi_track ()
     //				  "00" "ff59" "02" "ff" "00"
     ;
 
-  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";
-  String footer_string = String_convert::hex2bin (footer_str0);
+  string footer_string = String_convert::hex2bin (footer_str0);
 
   set ("MTrk", data_string, footer_string);
 }
@@ -448,20 +464,34 @@ 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
+string
 Midi_track::data_string () const
 {
-  String str = Midi_chunk::data_string ();
-  if (midi_debug_global_b)
+  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 ();
-      if (midi_debug_global_b)
+      str += (*i)->to_string ();
+      if (do_midi_debugging_global)
 	str += "\n";
     }
   return str;
 }
+
+
+char const *
+Midi_item::name () const
+{
+   return this->class_name ();
+}
+
+Midi_track::~Midi_track ()
+{
+  junk_pointers (events_);
+}