X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmidi-item.cc;h=0d0edbb4c7fc904a8f4526ecc6389799587e558b;hb=cfe204f50a73e31a4fa15091a1f812843ef6c245;hp=3d2d67a38e6b56319516a4322d78ee35842ffb4f;hpb=91f01637f31c7d904fd8016b49184e935bf1c8ab;p=lilypond.git diff --git a/lily/midi-item.cc b/lily/midi-item.cc index 3d2d67a38e..0d0edbb4c7 100644 --- a/lily/midi-item.cc +++ b/lily/midi-item.cc @@ -1,9 +1,20 @@ /* - midi-item.cc -- implement MIDI items. + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter + Copyright (C) 1997--2012 Jan Nieuwenhuizen - (c) 1997--2007 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 + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + LilyPond is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . */ #include "midi-item.hh" @@ -17,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) @@ -47,8 +56,6 @@ Midi_item::get_midi (Audio_item *a) return 0; } - - Midi_duration::Midi_duration (Real seconds_f) { seconds_ = seconds_f; @@ -61,8 +68,9 @@ Midi_duration::to_string () const } Midi_instrument::Midi_instrument (Audio_instrument *a) + : Midi_channel_item (a), + audio_ (a) { - audio_ = a; audio_->str_ = String_convert::to_lower (audio_->str_); } @@ -76,7 +84,7 @@ Midi_instrument::to_string () const 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); + program_byte = (Byte) scm_to_int (program); else warning (_f ("no such MIDI instrument: `%s'", audio_->str_.c_str ())); @@ -89,9 +97,9 @@ Midi_item::Midi_item () { } -Midi_channel_item::Midi_channel_item () +Midi_channel_item::Midi_channel_item (Audio_item *ai) + : channel_ (ai->channel_) { - channel_ = 0; } Midi_item::~Midi_item () @@ -114,16 +122,16 @@ int2midi_varint_string (int i) { str += ::to_string ((char)buffer); if (buffer & 0x80) - buffer >>= 8; + buffer >>= 8; else - break; + break; } return str; } Midi_key::Midi_key (Audio_key *a) + : audio_ (a) { - audio_ = a; } string @@ -139,9 +147,9 @@ 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; } string @@ -150,14 +158,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'); @@ -167,28 +173,30 @@ 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)) { - audio_ = a; - dynamic_byte_ = 0x7f; } - 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 @@ -201,13 +209,7 @@ Midi_note::to_string () const // print warning if fine tuning was needed, HJJ if (get_fine_tuning () != 0) { - warning (_f ("experimental: temporarily fine tuning (of %d cents) a channel.", - get_fine_tuning ())); - - 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)); @@ -217,7 +219,7 @@ Midi_note::to_string () const str += ::to_string ((char) status_byte); str += ::to_string ((char) (get_semitone_pitch () + c0_pitch_)); - str += ::to_string ((char)dynamic_byte_); + str += ::to_string ((char) dynamic_byte_); return str; } @@ -228,17 +230,14 @@ Midi_note_off::Midi_note_off (Midi_note *n) on_ = n; channel_ = n->channel_; - // Anybody who hears any difference, or knows how this works? - // 0 should definitely be avoided, notes stick on some sound cards. - // 64 is supposed to be neutral - - aftertouch_byte_ = 64; + // use note_on with velocity=0 instead of note_off + aftertouch_byte_ = 0; } string Midi_note_off::to_string () const { - Byte status_byte = (char) (0x80 + channel_); + Byte status_byte = (char) (0x90 + channel_); string str = ::to_string ((char)status_byte); str += ::to_string ((char) (get_semitone_pitch () + Midi_note::c0_pitch_)); @@ -249,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)); } @@ -257,8 +256,9 @@ Midi_note_off::to_string () const } Midi_dynamic::Midi_dynamic (Audio_dynamic *a) + : Midi_channel_item (a), + audio_ (a) { - audio_ = a; } string @@ -280,14 +280,19 @@ Midi_dynamic::to_string () const if (volume > full_scale) volume = (int)full_scale; + 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) { - audio_ = a; } string @@ -309,8 +314,8 @@ Midi_piano_pedal::to_string () const } Midi_tempo::Midi_tempo (Audio_tempo *a) + : audio_ (a) { - audio_ = a; } string @@ -323,8 +328,8 @@ Midi_tempo::to_string () const } Midi_text::Midi_text (Audio_text *a) + : audio_ (a) { - audio_ = a; } string @@ -340,5 +345,5 @@ Midi_text::to_string () const char const * Midi_item::name () const { - return this->class_name (); + return this->class_name (); }