X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmidi-item.cc;h=1fd33773adf9123177d1eaa25bffb9186e8b3e53;hb=1ed3ca1ad8893fc2cb76aa67a0830bcf52e2502c;hp=2a0b6a274fbc7407ec5015bda5eb3479b1bf0a7d;hpb=3ea702c329ba2121da532904a86e63f58c47a6ef;p=lilypond.git diff --git a/lily/midi-item.cc b/lily/midi-item.cc index 2a0b6a274f..1fd33773ad 100644 --- a/lily/midi-item.cc +++ b/lily/midi-item.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2002 Jan Nieuwenhuizen + (c) 1997--2004 Jan Nieuwenhuizen */ #include "warn.hh" @@ -19,6 +19,11 @@ #include "killing-cons.tcc" +#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) + Midi_item* Midi_item::get_midi (Audio_item* a) { @@ -61,7 +66,7 @@ Midi_chunk::data_string () const } String -Midi_chunk::string () const +Midi_chunk::to_string () const { String str = header_string_; String dat = data_string (); @@ -80,9 +85,9 @@ Midi_duration::Midi_duration (Real seconds_f) } String -Midi_duration::string () const +Midi_duration::to_string () const { - return String (""; + return String (""; } Midi_event::Midi_event (Moment delta_mom, Midi_item* midi) @@ -95,14 +100,14 @@ Midi_event::Midi_event (Moment delta_mom, Midi_item* midi) ugh. midi output badly broken since grace note hackage. */ String -Midi_event::string () const +Midi_event::to_string () const { Rational rat_dt = (delta_mom_.main_part_ * Rational (384) + delta_mom_.grace_part_ * Rational (100))*Rational (4); int delta_i = int (rat_dt); String delta_string = Midi_item::i2varint_string (delta_i); - String midi_string = midi_->string (); + String midi_string = midi_->to_string (); assert (midi_string.length ()); return delta_string + midi_string; } @@ -131,7 +136,7 @@ Midi_instrument::Midi_instrument (Audio_instrument* a) } String -Midi_instrument::string () const +Midi_instrument::to_string () const { Byte program_byte = 0; bool found = false; @@ -139,16 +144,16 @@ Midi_instrument::string () const /* UGH. don't use eval. */ - SCM proc = scm_primitive_eval (ly_symbol2scm ("midi-program")); + SCM proc = ly_scheme_function ("midi-program"); SCM program = gh_call1 (proc, ly_symbol2scm (audio_->str_.to_str0 ())); found = (program != SCM_BOOL_F); if (found) - program_byte = gh_scm2int(program); + program_byte = gh_scm2int (program); else - warning (_f ("no such instrument: `%s'", audio_->str_.to_str0 ())); + warning (_f ("no such MIDI instrument: `%s'", audio_->str_.to_str0 ())); - String str = to_string ((char) (0xc0 + channel_)); //YIKES! FIXME: Should be track. -rz - str += to_string ((char)program_byte); + String str = ::to_string ((char) (0xc0 + channel_)); //YIKES! FIXME: Should be track. -rz + str += ::to_string ((char)program_byte); return str; } @@ -175,7 +180,7 @@ Midi_item::i2varint_string (int i) String str; while (1) { - str += to_string ((char)buffer_i); + str += ::to_string ((char)buffer_i); if (buffer_i & 0x80) buffer_i >>= 8; else @@ -190,7 +195,7 @@ Midi_key::Midi_key (Audio_key*a) } String -Midi_key::string () const +Midi_key::to_string () const { String str = "ff5902"; str += String_convert::int2hex (audio_->accidentals_, 2, '0'); @@ -208,7 +213,7 @@ Midi_time_signature::Midi_time_signature (Audio_time_signature* a) } String -Midi_time_signature::string () const +Midi_time_signature::to_string () const { int num = audio_->beats_; int den = audio_->one_beat_; @@ -228,20 +233,21 @@ Midi_note::Midi_note (Audio_note* a) } Moment -Midi_note::length_mom () const +Midi_note::get_length () const { Moment m = audio_->length_mom_; -#if 0 - //junkme? - if (m < Moment (Rational (1, 1000))) - { - warning (_ ("silly duration")); - m = 1; - } -#endif return m; } +int +Midi_note::get_fine_tuning () const +{ + int ft = audio_->pitch_.quartertone_pitch (); + ft -= 2 * audio_->pitch_.semitone_pitch (); + ft *= 50; // 1 quarter tone = 50 cents + return ft; +} + int Midi_note::get_pitch () const { @@ -255,14 +261,33 @@ Midi_note::get_pitch () const } String -Midi_note::string () const +Midi_note::to_string () const { Byte status_byte = (char) (0x90 + channel_); + String str = ""; + int finetune; - String str = to_string ((char)status_byte); - str += to_string ((char) (get_pitch () + c0_pitch_i_)); + // 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); + + str += ::to_string ((char) (0xE0 + channel_)); + str += ::to_string ((char) (finetune & 0x7F)); + str += ::to_string ((char) (finetune >> 7)); + str += ::to_string ((char) (0x00)); + } + + str += ::to_string ((char)status_byte); + str += ::to_string ((char) (get_pitch () + c0_pitch_i_)); + str += ::to_string ((char)dynamic_byte_); - str += to_string ((char)dynamic_byte_); return str; } @@ -280,13 +305,23 @@ Midi_note_off::Midi_note_off (Midi_note* n) } String -Midi_note_off::string () const +Midi_note_off::to_string () const { Byte status_byte = (char) (0x80 + channel_); - String str = to_string ((char)status_byte); - str += to_string ((char) (get_pitch () + Midi_note::c0_pitch_i_)); - str += to_string ((char)aftertouch_byte_); + String str = ::to_string ((char)status_byte); + str += ::to_string ((char) (get_pitch () + Midi_note::c0_pitch_i_)); + str += ::to_string ((char)aftertouch_byte_); + + if (get_fine_tuning () != 0) + { + // 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 >> 7)); + } + return str; } @@ -296,10 +331,10 @@ Midi_dynamic::Midi_dynamic (Audio_dynamic* a) } String -Midi_dynamic::string () const +Midi_dynamic::to_string () const { Byte status_byte = (char) (0xB0 + channel_); - String str = to_string ((char)status_byte); + String str = ::to_string ((char)status_byte); /* Main volume controller (per channel): @@ -314,8 +349,8 @@ Midi_dynamic::string () const if (volume > full_scale) volume = (int)full_scale; - str += to_string ((char)0x07); - str += to_string ((char)volume); + str += ::to_string ((char)0x07); + str += ::to_string ((char)volume); return str; } @@ -325,20 +360,20 @@ Midi_piano_pedal::Midi_piano_pedal (Audio_piano_pedal* a) } String -Midi_piano_pedal::string () const +Midi_piano_pedal::to_string () const { Byte status_byte = (char) (0xB0 + channel_); - String str = to_string ((char)status_byte); + String str = ::to_string ((char)status_byte); if (audio_->type_string_ == "Sostenuto") - str += to_string ((char)0x42); + str += ::to_string ((char)0x42); else if (audio_->type_string_ == "Sustain") - str += to_string ((char)0x40); + str += ::to_string ((char)0x40); else if (audio_->type_string_ == "UnaCorda") - str += to_string ((char)0x43); + str += ::to_string ((char)0x43); int pedal = ((1 - audio_->dir_) / 2) * 0x7f; - str += to_string ((char)pedal); + str += ::to_string ((char)pedal); return str; } @@ -348,7 +383,7 @@ Midi_tempo::Midi_tempo (Audio_tempo* a) } String -Midi_tempo::string () const +Midi_tempo::to_string () const { int useconds_per_4_i = 60 * (int)1e6 / audio_->per_minute_4_; String str = "ff5103"; @@ -362,7 +397,7 @@ Midi_text::Midi_text (Audio_text* a) } String -Midi_text::string () const +Midi_text::to_string () const { String str = "ff" + String_convert::int2hex (audio_->type_, 2, '0'); str = String_convert::hex2bin (str); @@ -427,7 +462,7 @@ Midi_track::data_string () const str += "\n"; for (Cons *i=event_p_list_.head_; i; i = i->next_) { - str += i->car_->string (); + str += i->car_->to_string (); if (midi_debug_global_b) str += "\n"; }