X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmidi-item.cc;h=fb7df2437561636393ecf621a8b6354f882d12c5;hb=ffb2d00dbc64ad3a8702a98e8d7d2e0c31890e9a;hp=1fcb259ae13c2c0b6b0ee94967476cd8099f3928;hpb=9b8bc059ef1f4b932b9cd6ec522945cdcd99e1cb;p=lilypond.git

diff --git a/lily/midi-item.cc b/lily/midi-item.cc
index 1fcb259ae1..fb7df24375 100644
--- a/lily/midi-item.cc
+++ b/lily/midi-item.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2011 Jan Nieuwenhuizen <janneke@gnu.org>
+  Copyright (C) 1997--2012 Jan Nieuwenhuizen <janneke@gnu.org>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -28,10 +28,8 @@
 #include "string-convert.hh"
 #include "warn.hh"
 
-#define PITCH_WHEEL_TOP 0x3FFF
 #define PITCH_WHEEL_CENTER 0x2000
-#define PITCH_WHEEL_BOTTOM 0x0000
-#define PITCH_WHEEL_RANGE (PITCH_WHEEL_TOP - PITCH_WHEEL_BOTTOM)
+#define PITCH_WHEEL_SEMITONE 0X1000
 
 Midi_item *
 Midi_item::get_midi (Audio_item *a)
@@ -58,8 +56,6 @@ Midi_item::get_midi (Audio_item *a)
   return 0;
 }
 
-
-
 Midi_duration::Midi_duration (Real seconds_f)
 {
   seconds_ = seconds_f;
@@ -72,8 +68,8 @@ Midi_duration::to_string () const
 }
 
 Midi_instrument::Midi_instrument (Audio_instrument *a)
-  : Midi_channel_item (a)
-  , audio_ (a)
+  : Midi_channel_item (a),
+    audio_ (a)
 {
   audio_->str_ = String_convert::to_lower (audio_->str_);
 }
@@ -126,9 +122,9 @@ int2midi_varint_string (int i)
     {
       str += ::to_string ((char)buffer);
       if (buffer & 0x80)
-	buffer >>= 8;
+        buffer >>= 8;
       else
-	break;
+        break;
     }
   return str;
 }
@@ -151,8 +147,8 @@ Midi_key::to_string () const
 }
 
 Midi_time_signature::Midi_time_signature (Audio_time_signature *a)
-  : audio_ (a)
-  , clocks_per_1_ (18)
+  : audio_ (a),
+    clocks_per_1_ (18)
 {
 }
 
@@ -168,8 +164,6 @@ Midi_time_signature::to_string () const
 
   int den = audio_->one_beat_;
 
-
-  
   string str = "ff5804";
   str += String_convert::int2hex (num, 2, '0');
   str += String_convert::int2hex (intlog2 (den), 2, '0');
@@ -179,10 +173,10 @@ Midi_time_signature::to_string () const
 }
 
 Midi_note::Midi_note (Audio_note *a)
-  : Midi_channel_item (a)
-  , audio_ (a)
-  , dynamic_byte_ (a->dynamic_ && a->dynamic_->volume_ >= 0
-		   ? Byte (a->dynamic_->volume_ * 0x7f) : Byte (0x5a))
+  : Midi_channel_item (a),
+    audio_ (a),
+    dynamic_byte_ (a->dynamic_ && a->dynamic_->volume_ >= 0
+                   ? Byte (a->dynamic_->volume_ * 0x7f) : Byte (0x5a))
 {
 }
 
@@ -190,18 +184,19 @@ int
 Midi_note::get_fine_tuning () const
 {
   Rational tune = (audio_->pitch_.tone_pitch ()
-		   + audio_->transposing_.tone_pitch ()) * Rational (2);
+                   + audio_->transposing_.tone_pitch ()) * Rational (2);
   tune -= Rational (get_semitone_pitch ());
 
-  tune *= 100;
+  tune *= PITCH_WHEEL_SEMITONE;
   return (int) double (tune);
 }
 
 int
 Midi_note::get_semitone_pitch () const
 {
-  return int (double ((audio_->pitch_.tone_pitch ()
-		       + audio_->transposing_.tone_pitch ()) * Rational (2)));
+  double tune = double ((audio_->pitch_.tone_pitch ()
+                         + audio_->transposing_.tone_pitch ()) * Rational (2));
+  return int (rint (tune));
 }
 
 string
@@ -214,10 +209,7 @@ Midi_note::to_string () const
   // print warning if fine tuning was needed, HJJ
   if (get_fine_tuning () != 0)
     {
-      finetune = PITCH_WHEEL_CENTER;
-      // Move pitch wheel to a shifted position.
-      // The pitch wheel range (of 4 semitones) is multiplied by the cents.
-      finetune += (PITCH_WHEEL_RANGE *get_fine_tuning ()) / (4 * 100);
+      finetune = PITCH_WHEEL_CENTER + get_fine_tuning ();
 
       str += ::to_string ((char) (0xE0 + channel_));
       str += ::to_string ((char) (finetune & 0x7F));
@@ -256,7 +248,7 @@ Midi_note_off::to_string () const
       // Move pitch wheel back to the central position.
       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 & 0x7F));
       str += ::to_string ((char) (PITCH_WHEEL_CENTER >> 7));
     }
 
@@ -264,8 +256,8 @@ Midi_note_off::to_string () const
 }
 
 Midi_dynamic::Midi_dynamic (Audio_dynamic *a)
-  : Midi_channel_item (a)
-  , audio_ (a)
+  : Midi_channel_item (a),
+    audio_ (a)
 {
 }
 
@@ -291,15 +283,15 @@ Midi_dynamic::to_string () const
   int const volume_default = 100;
   if (audio_->volume_ < 0 || audio_->silent_)
     volume = volume_default;
-  
+
   str += ::to_string ((char)0x07);
   str += ::to_string ((char)volume);
   return str;
 }
 
 Midi_piano_pedal::Midi_piano_pedal (Audio_piano_pedal *a)
-  : Midi_channel_item (a)
-  , audio_ (a)
+  : Midi_channel_item (a),
+    audio_ (a)
 {
 }
 
@@ -353,5 +345,5 @@ Midi_text::to_string () const
 char const *
 Midi_item::name () const
 {
-   return this->class_name ();
+  return this->class_name ();
 }