X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmidi-item.cc;h=ba29ba0ba59264a2d51682489a34f3e1300eb7db;hb=77267b700c377fd170abcbf4863728937038eb5e;hp=b3b064b67ac300d88124467978bfa0f66bc5f8e3;hpb=1c846b2c2348b4e0ca4a3c2e8fb267047ba2d203;p=lilypond.git diff --git a/lily/midi-item.cc b/lily/midi-item.cc index b3b064b67a..ba29ba0ba5 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 @@ -19,19 +19,20 @@ #include "midi-item.hh" +#include "audio-column.hh" #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_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) @@ -42,8 +43,6 @@ Midi_item::get_midi (Audio_item *a) return i->str_.length () ? new Midi_instrument (i) : 0; else if (Audio_note *i = dynamic_cast (a)) return new Midi_note (i); - else if (Audio_dynamic *i = dynamic_cast (a)) - return new Midi_dynamic (i); else if (Audio_piano_pedal *i = dynamic_cast (a)) return new Midi_piano_pedal (i); else if (Audio_tempo *i = dynamic_cast (a)) @@ -52,14 +51,14 @@ 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_change *i = dynamic_cast (a)) + return new Midi_control_change (i); else assert (0); return 0; } - - Midi_duration::Midi_duration (Real seconds_f) { seconds_ = seconds_f; @@ -72,8 +71,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_); } @@ -83,9 +83,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 @@ -100,15 +99,29 @@ Midi_item::Midi_item () { } -Midi_channel_item::Midi_channel_item () +Midi_channel_item::Midi_channel_item (Audio_item *ai) + : channel_ (ai->channel_) +{ +} + +Midi_control_change::Midi_control_change (Audio_control_change *ai) + : Midi_channel_item (ai), + audio_ (ai) { - channel_ = 0; } Midi_item::~Midi_item () { } +Midi_channel_item::~Midi_channel_item () +{ +} + +Midi_control_change::~Midi_control_change () +{ +} + string int2midi_varint_string (int i) { @@ -125,16 +138,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 @@ -150,9 +163,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 @@ -161,14 +174,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'); @@ -178,28 +189,32 @@ Midi_time_signature::to_string () const } Midi_note::Midi_note (Audio_note *a) + : Midi_channel_item (a), + audio_ (a), + dynamic_byte_ (min (max (Byte ((a->dynamic_ + ? a->dynamic_->get_volume (a->audio_column_->when ()) * 0x7f : 0x5a) + + a->extra_velocity_), + Byte (0)), Byte (0x7f))) { - audio_ = a; - dynamic_byte_ = 0x5a; } - 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 @@ -212,10 +227,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)); @@ -254,45 +266,17 @@ 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)); } return str; } -Midi_dynamic::Midi_dynamic (Audio_dynamic *a) -{ - audio_ = a; -} - -string -Midi_dynamic::to_string () const -{ - Byte status_byte = (char) (0xB0 + channel_); - string str = ::to_string ((char)status_byte); - - /* - Main volume controller (per channel): - 07 MSB - 27 LSB - */ - static Real const full_scale = 127; - - int volume = (int) (audio_->volume_ * full_scale); - if (volume <= 0) - volume = 1; - if (volume > full_scale) - volume = (int)full_scale; - - 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 @@ -314,8 +298,8 @@ Midi_piano_pedal::to_string () const } Midi_tempo::Midi_tempo (Audio_tempo *a) + : audio_ (a) { - audio_ = a; } string @@ -328,8 +312,8 @@ Midi_tempo::to_string () const } Midi_text::Midi_text (Audio_text *a) + : audio_ (a) { - audio_ = a; } string @@ -342,8 +326,18 @@ Midi_text::to_string () const return str; } +string +Midi_control_change::to_string () const +{ + Byte status_byte = (char) (0xB0 + channel_); + string str = ::to_string ((char)status_byte); + str += ::to_string ((char) (audio_->control_)); + str += ::to_string ((char) (audio_->value_)); + return str; +} + char const * Midi_item::name () const { - return this->class_name (); + return class_name (); }