X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmidi-item.cc;h=4909217c4319c108cca8aba6b22ea9533e5c9b37;hb=9e781b7dc83b60a543ce218aa1a5f139f74c760f;hp=0d0edbb4c7fc904a8f4526ecc6389799587e558b;hpb=e47e8dc419d5c9657a0ff357a3c32cd4d84a7fac;p=lilypond.git

diff --git a/lily/midi-item.cc b/lily/midi-item.cc
index 0d0edbb4c7..4909217c43 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--2012 Jan Nieuwenhuizen <janneke@gnu.org>
+  Copyright (C) 1997--2014 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
@@ -21,6 +21,7 @@
 
 #include "duration.hh"
 #include "international.hh"
+#include "libc-extension.hh"
 #include "main.hh"
 #include "midi-stream.hh"
 #include "misc.hh"
@@ -50,6 +51,9 @@ Midi_item::get_midi (Audio_item *a)
     return new Midi_time_signature (i);
   else if (Audio_text *i = dynamic_cast<Audio_text *> (a))
     return new Midi_text (i);
+  else if (Audio_control_function_value_change *i
+           = dynamic_cast<Audio_control_function_value_change *> (a))
+    return new Midi_control_function_value_change (i);
   else
     assert (0);
 
@@ -102,10 +106,24 @@ Midi_channel_item::Midi_channel_item (Audio_item *ai)
 {
 }
 
+Midi_control_function_value_change
+::Midi_control_function_value_change (Audio_control_function_value_change *ai)
+  : Midi_channel_item (ai), control_ (ai->control_), value_ (ai->value_)
+{
+}
+
 Midi_item::~Midi_item ()
 {
 }
 
+Midi_channel_item::~Midi_channel_item ()
+{
+}
+
+Midi_control_function_value_change::~Midi_control_function_value_change ()
+{
+}
+
 string
 int2midi_varint_string (int i)
 {
@@ -175,8 +193,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))
+    dynamic_byte_ (min (max (Byte ((a->dynamic_ && a->dynamic_->volume_ >= 0
+                                    ? a->dynamic_->volume_ * 0x7f : 0x5a)
+                                   + a->extra_velocity_),
+                             Byte (0)), Byte (0x7f)))
 {
 }
 
@@ -342,6 +362,66 @@ Midi_text::to_string () const
   return str;
 }
 
+string
+Midi_control_function_value_change::to_string () const
+{
+  // MIDI control function information.  A MIDI control function may have one
+  // or two assigned control numbers depending on whether it supports coarse
+  // (7-bit) or fine (14-bit) resolution.  If the control function supports
+  // fine resolution, the first (respectively, second) member of the structure
+  // represents the control number for setting the most (least) significant 7
+  // bits of the control function's value.
+  struct Control_function
+  {
+    int msb_control_number_;
+    int lsb_control_number_;
+  };
+
+  // Mapping from supported control functions (enumeration values defined in
+  // Audio_controller_value_change::Control) to the corresponding MIDI control
+  // numbers.
+  static const Control_function control_functions[] =
+    {
+      // When adding support for new control functions, please note the
+      // following:
+      // - The order of the control number definitions should be kept
+      //   consistent with the order of the enumeration values defined in
+      //   Audio_control_function_value_change::Control.
+      // - If the control function has only coarse resolution, the function's
+      //   control number should be stored in the MSB member of the array
+      //   element, and the LSB member should be set to a negative value.
+
+      {  8, 40 }, // balance
+      { 10, 42 }, // pan position
+      { 91, -1 }, // reverb level (only coarse resolution available)
+      { 93, -1 }  // chorus level (only coarse resolution available)
+    };
+
+  string str;
+  const Control_function *control_function = &control_functions[control_];
+  static const Real full_fine_scale = 0x3FFF;
+  static const Real full_coarse_scale = 0x7F;
+  bool fine_resolution = (control_function->lsb_control_number_ >= 0);
+  // value_ is in range [0.0 .. 1.0].  For directional value ranges,
+  // #CENTER will correspond to 0.5 exactly, and my_round rounds
+  // upwards when in case of doubt.  That means that center position
+  // will round to 0x40 or 0x2000 by a hair's breadth.
+  int value = (int) my_round (value_ * (fine_resolution ?
+                                        full_fine_scale : full_coarse_scale));
+  Byte status_byte = (char) (0xB0 + channel_);
+  str += ::to_string ((char)status_byte);
+  str += ::to_string ((char)(control_function->msb_control_number_));
+  str += ::to_string ((char)(fine_resolution ? (value >> 7) : value));
+  if (fine_resolution)
+    {
+      str += ::to_string ((char)0x00);
+      str += ::to_string ((char)status_byte);
+      str += ::to_string ((char)(control_function->lsb_control_number_));
+      str += ::to_string ((char)(value & 0x7F));
+    }
+  return str;
+}
+
 char const *
 Midi_item::name () const
 {