Merge branch 'master' of git://git.sv.gnu.org/lilypond

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

diff --git a/lily/midi-item.cc b/lily/midi-item.cc
index a7d3e629d8af69c04c1a548095e2594e5f76a82e..3fcdb4ca223d6c7ebea4a3b6e983cfc6cab6001d 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
@@ -106,25 +104,25 @@ 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 ();
+  int delta = rat_dt.to_int ();
 
-  string delta_string = Midi_item::i2varint_string (delta_i);
+  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 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, "");
@@ -159,6 +157,15 @@ Midi_instrument::to_string () const
 }
 
 Midi_item::Midi_item ()
+{
+}
+
+Midi_channel_item::~Midi_channel_item ()
+{
+  channel_ = 0;
+}
+
+Midi_channel_item::Midi_channel_item ()
 {
   channel_ = 0;
 }
@@ -170,20 +177,20 @@ Midi_item::~Midi_item ()
 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;
   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;
     }
@@ -251,22 +258,19 @@ 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
@@ -294,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;
@@ -319,7 +323,7 @@ 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_));
+  str += ::to_string ((char) (get_semitone_pitch () + Midi_note::c0_pitch_));
   str += ::to_string ((char)aftertouch_byte_);
 
   if (get_fine_tuning () != 0)
@@ -394,9 +398,9 @@ Midi_tempo::Midi_tempo (Audio_tempo *a)
 string
 Midi_tempo::to_string () const
 {
-  int useconds_per_4_i = 60 * (int)1e6 / audio_->per_minute_4_;
+  int useconds_per_4 = 60 * (int)1e6 / audio_->per_minute_4_;
   string str = "ff5103";
-  str += String_convert::int2hex (useconds_per_4_i, 6, '0');
+  str += String_convert::int2hex (useconds_per_4, 6, '0');
   return String_convert::hex2bin (str);
 }