X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fmidi-item.cc;h=33dd9f11bde71fedb14e67b0174fc4b0e277fc1a;hb=5d40b498e0b3c7cb2e0fdf5e90ad7be54f72211c;hp=aa96849f26c81d4ffe8674fde7c1e7cc4d129e68;hpb=dcca081b1904b4db09658657631d919f280c06d2;p=lilypond.git diff --git a/lily/midi-item.cc b/lily/midi-item.cc index aa96849f26..33dd9f11bd 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 + Copyright (C) 1997--2015 Jan Nieuwenhuizen 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,12 +21,14 @@ #include "duration.hh" #include "international.hh" +#include "libc-extension.hh" #include "main.hh" #include "midi-stream.hh" #include "misc.hh" #include "program-option.hh" #include "string-convert.hh" #include "warn.hh" +#include "lily-imports.hh" #define PITCH_WHEEL_CENTER 0x2000 #define PITCH_WHEEL_SEMITONE 0X1000 @@ -50,14 +52,15 @@ Midi_item::get_midi (Audio_item *a) return new Midi_time_signature (i); else if (Audio_text *i = dynamic_cast (a)) return new Midi_text (i); + else if (Audio_control_function_value_change *i + = dynamic_cast (a)) + return new Midi_control_function_value_change (i); else assert (0); return 0; } - - Midi_duration::Midi_duration (Real seconds_f) { seconds_ = seconds_f; @@ -70,8 +73,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_); } @@ -82,9 +85,8 @@ Midi_instrument::to_string () const Byte program_byte = 0; bool found = false; - SCM proc = ly_lily_module_constant ("midi-program"); - SCM program = scm_call_1 (proc, ly_symbol2scm (audio_->str_.c_str ())); - found = (program != SCM_BOOL_F); + SCM program = Lily::midi_program (ly_symbol2scm (audio_->str_.c_str ())); + found = (scm_is_true (program)); if (found) program_byte = (Byte) scm_to_int (program); else @@ -104,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) { @@ -124,9 +140,9 @@ int2midi_varint_string (int i) { str += ::to_string ((char)buffer); if (buffer & 0x80) - buffer >>= 8; + buffer >>= 8; else - break; + break; } return str; } @@ -149,8 +165,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) { } @@ -160,14 +176,12 @@ Midi_time_signature::to_string () const int num = abs (audio_->beats_); if (num > 255) { - warning ("Time signature with more than 255 beats. Truncating"); + warning (_ ("Time signature with more than 255 beats. Truncating")); num = 255; } int den = audio_->one_beat_; - - string str = "ff5804"; str += String_convert::int2hex (num, 2, '0'); str += String_convert::int2hex (intlog2 (den), 2, '0'); @@ -177,10 +191,12 @@ 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_ (min (max (Byte ((a->dynamic_ && a->dynamic_->volume_ >= 0 + ? a->dynamic_->volume_ * 0x7f : 0x5a) + + a->extra_velocity_), + Byte (0)), Byte (0x7f))) { } @@ -188,7 +204,7 @@ 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 *= PITCH_WHEEL_SEMITONE; @@ -199,7 +215,7 @@ int Midi_note::get_semitone_pitch () const { double tune = double ((audio_->pitch_.tone_pitch () - + audio_->transposing_.tone_pitch ()) * Rational (2)); + + audio_->transposing_.tone_pitch ()) * Rational (2)); return int (rint (tune)); } @@ -252,7 +268,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)); } @@ -260,8 +276,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) { } @@ -287,15 +303,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) { } @@ -346,8 +362,69 @@ 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 + { 11, 43 }, // expression + { 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 { - return this->class_name (); + return class_name (); }