X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmidi-item.cc;h=b2f1231ae19559364e849f9e397be2f789df8a4b;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=34184b636a1602a4ae526adbf752cb9a366c9944;hpb=b37e3f652677ae0298423db9fa0e552e5fce0c92;p=lilypond.git diff --git a/lily/midi-item.cc b/lily/midi-item.cc index 34184b636a..b2f1231ae1 100644 --- a/lily/midi-item.cc +++ b/lily/midi-item.cc @@ -1,9 +1,9 @@ /* - midi-item.cc -- implement Midi items. + midi-item.cc -- implement MIDI items. source file of the GNU LilyPond music typesetter - (c) 1997--2006 Jan Nieuwenhuizen + (c) 1997--2008 Jan Nieuwenhuizen */ #include "midi-item.hh" @@ -17,8 +17,6 @@ #include "string-convert.hh" #include "warn.hh" -#include "killing-cons.tcc" - #define PITCH_WHEEL_TOP 0x3FFF #define PITCH_WHEEL_CENTER 0x2000 #define PITCH_WHEEL_BOTTOM 0x0000 @@ -42,92 +40,24 @@ Midi_item::get_midi (Audio_item *a) else if (Audio_time_signature *i = dynamic_cast (a)) return new Midi_time_signature (i); else if (Audio_text *i = dynamic_cast (a)) - //return i->text_string_.length () ? new Midi_text (i) : 0; return new Midi_text (i); else assert (0); - // isn't C++ grand? return 0; } -void -Midi_chunk::set (std::string header_string, std::string data_string, std::string footer_string) -{ - data_string_ = data_string; - footer_string_ = footer_string; - header_string_ = header_string; -} - -std::string -Midi_chunk::data_string () const -{ - return data_string_; -} - -std::string -Midi_chunk::to_string () const -{ - std::string str = header_string_; - std::string dat = data_string (); - std::string length_string = String_convert::int2hex (dat.length () - + footer_string_.length (), 8, '0'); - length_string = String_convert::hex2bin (length_string); - - str += length_string; - str += dat; - str += footer_string_; - return str; -} Midi_duration::Midi_duration (Real seconds_f) { seconds_ = seconds_f; } -std::string +string Midi_duration::to_string () const { - return std::string (""; -} - -Midi_event::Midi_event (Moment delta_mom, Midi_item *midi) -{ - delta_mom_ = delta_mom; - midi_ = midi; -} - -/* - ugh. midi output badly broken since grace note hackage. -*/ -std::string -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 = rat_dt.to_int (); - - std::string delta_string = Midi_item::i2varint_string (delta_i); - std::string midi_string = midi_->to_string (); - assert (midi_string.length ()); - return delta_string + midi_string; -} - -Midi_header::Midi_header (int format_i, int tracks_i, int clocks_per_4_i) -{ - std::string str; - - std::string format_string = String_convert::int2hex (format_i, 4, '0'); - str += String_convert::hex2bin (format_string); - - std::string tracks_string = String_convert::int2hex (tracks_i, 4, '0'); - str += String_convert::hex2bin (tracks_string); - - std::string tempo_string = String_convert::int2hex (clocks_per_4_i, 4, '0'); - str += String_convert::hex2bin (tempo_string); - - set ("MThd", str, ""); + return string (""; } Midi_instrument::Midi_instrument (Audio_instrument *a) @@ -136,15 +66,12 @@ Midi_instrument::Midi_instrument (Audio_instrument *a) audio_->str_ = String_convert::to_lower (audio_->str_); } -std::string +string Midi_instrument::to_string () const { Byte program_byte = 0; bool found = false; - /* - UGH. don't use eval. - */ 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); @@ -153,12 +80,16 @@ Midi_instrument::to_string () const else warning (_f ("no such MIDI instrument: `%s'", audio_->str_.c_str ())); - std::string str = std::to_string ((char) (0xc0 + channel_)); //YIKES! FIXME : Should be track. -rz - str += std::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; } Midi_item::Midi_item () +{ +} + +Midi_channel_item::Midi_channel_item () { channel_ = 0; } @@ -167,23 +98,23 @@ Midi_item::~Midi_item () { } -std::string -Midi_item::i2varint_string (int i) +string +int2midi_varint_string (int i) { - int buffer_i = i & 0x7f; + int buffer = i & 0x7f; while ((i >>= 7) > 0) { - buffer_i <<= 8; - buffer_i |= 0x80; - buffer_i += (i & 0x7f); + buffer <<= 8; + buffer |= 0x80; + buffer += (i & 0x7f); } - std::string str; + string str; while (1) { - str += std::to_string ((char)buffer_i); - if (buffer_i & 0x80) - buffer_i >>= 8; + str += ::to_string ((char)buffer); + if (buffer & 0x80) + buffer >>= 8; else break; } @@ -195,10 +126,10 @@ Midi_key::Midi_key (Audio_key *a) audio_ = a; } -std::string +string Midi_key::to_string () const { - std::string str = "ff5902"; + string str = "ff5902"; str += String_convert::int2hex (audio_->accidentals_, 2, '0'); if (audio_->major_) str += String_convert::int2hex (0, 2, '0'); @@ -213,13 +144,21 @@ Midi_time_signature::Midi_time_signature (Audio_time_signature *a) clocks_per_1_ = 18; } -std::string +string Midi_time_signature::to_string () const { - int num = audio_->beats_; + int num = abs (audio_->beats_); + if (num > 255) + { + warning ("Time signature with more than 255 beats. Truncating"); + num = 255; + } + int den = audio_->one_beat_; - std::string str = "ff5804"; + + + string str = "ff5804"; str += String_convert::int2hex (num, 2, '0'); str += String_convert::int2hex (intlog2 (den), 2, '0'); str += String_convert::int2hex (clocks_per_1_, 2, '0'); @@ -233,61 +172,49 @@ Midi_note::Midi_note (Audio_note *a) dynamic_byte_ = 0x7f; } -Moment -Midi_note::get_length () const -{ - Moment m = audio_->length_mom_; - 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; + Rational tune = (audio_->pitch_.tone_pitch () + + audio_->transposing_.tone_pitch ()) * Rational (2); + tune -= Rational (get_semitone_pitch ()); + + tune *= 100; + return (int) double (tune); } int -Midi_note::get_pitch () const +Midi_note::get_semitone_pitch () const { - int p = audio_->pitch_.semitone_pitch () + audio_->transposing_; - if (p == INT_MAX) - { - warning (_ ("silly pitch")); - p = 0; - } - return p; + return int (double ((audio_->pitch_.tone_pitch () + + audio_->transposing_.tone_pitch ()) * Rational (2))); } -std::string +string Midi_note::to_string () const { Byte status_byte = (char) (0x90 + channel_); - std::string str = ""; + string str = ""; int finetune; // 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 += std::to_string ((char) (0xE0 + channel_)); - str += std::to_string ((char) (finetune & 0x7F)); - str += std::to_string ((char) (finetune >> 7)); - str += std::to_string ((char) (0x00)); + str += ::to_string ((char) (0xE0 + channel_)); + str += ::to_string ((char) (finetune & 0x7F)); + str += ::to_string ((char) (finetune >> 7)); + str += ::to_string ((char) (0x00)); } - str += std::to_string ((char)status_byte); - str += std::to_string ((char) (get_pitch () + c0_pitch_i_)); - str += std::to_string ((char)dynamic_byte_); + str += ::to_string ((char) status_byte); + str += ::to_string ((char) (get_semitone_pitch () + c0_pitch_)); + str += ::to_string ((char) dynamic_byte_); return str; } @@ -305,22 +232,22 @@ Midi_note_off::Midi_note_off (Midi_note *n) aftertouch_byte_ = 64; } -std::string +string Midi_note_off::to_string () const { Byte status_byte = (char) (0x80 + channel_); - std::string str = std::to_string ((char)status_byte); - str += std::to_string ((char) (get_pitch () + Midi_note::c0_pitch_i_)); - str += std::to_string ((char)aftertouch_byte_); + string str = ::to_string ((char)status_byte); + str += ::to_string ((char) (get_semitone_pitch () + Midi_note::c0_pitch_)); + str += ::to_string ((char)aftertouch_byte_); if (get_fine_tuning () != 0) { // Move pitch wheel back to the central position. - str += std::to_string ((char) 0x00); - str += std::to_string ((char) (0xE0 + channel_)); - str += std::to_string ((char) (PITCH_WHEEL_CENTER &0x7F)); - str += std::to_string ((char) (PITCH_WHEEL_CENTER >> 7)); + 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; @@ -331,11 +258,11 @@ Midi_dynamic::Midi_dynamic (Audio_dynamic *a) audio_ = a; } -std::string +string Midi_dynamic::to_string () const { Byte status_byte = (char) (0xB0 + channel_); - std::string str = std::to_string ((char)status_byte); + string str = ::to_string ((char)status_byte); /* Main volume controller (per channel): @@ -350,8 +277,8 @@ Midi_dynamic::to_string () const if (volume > full_scale) volume = (int)full_scale; - str += std::to_string ((char)0x07); - str += std::to_string ((char)volume); + str += ::to_string ((char)0x07); + str += ::to_string ((char)volume); return str; } @@ -360,21 +287,21 @@ Midi_piano_pedal::Midi_piano_pedal (Audio_piano_pedal *a) audio_ = a; } -std::string +string Midi_piano_pedal::to_string () const { Byte status_byte = (char) (0xB0 + channel_); - std::string str = std::to_string ((char)status_byte); + string str = ::to_string ((char)status_byte); if (audio_->type_string_ == "Sostenuto") - str += std::to_string ((char)0x42); + str += ::to_string ((char)0x42); else if (audio_->type_string_ == "Sustain") - str += std::to_string ((char)0x40); + str += ::to_string ((char)0x40); else if (audio_->type_string_ == "UnaCorda") - str += std::to_string ((char)0x43); + str += ::to_string ((char)0x43); int pedal = ((1 - audio_->dir_) / 2) * 0x7f; - str += std::to_string ((char)pedal); + str += ::to_string ((char)pedal); return str; } @@ -383,12 +310,12 @@ Midi_tempo::Midi_tempo (Audio_tempo *a) audio_ = a; } -std::string +string Midi_tempo::to_string () const { - int useconds_per_4_i = 60 * (int)1e6 / audio_->per_minute_4_; - std::string str = "ff5103"; - str += String_convert::int2hex (useconds_per_4_i, 6, '0'); + int useconds_per_4 = 60 * (int)1e6 / audio_->per_minute_4_; + string str = "ff5103"; + str += String_convert::int2hex (useconds_per_4, 6, '0'); return String_convert::hex2bin (str); } @@ -397,80 +324,16 @@ Midi_text::Midi_text (Audio_text *a) audio_ = a; } -std::string +string Midi_text::to_string () const { - std::string str = "ff" + String_convert::int2hex (audio_->type_, 2, '0'); + string str = "ff" + String_convert::int2hex (audio_->type_, 2, '0'); str = String_convert::hex2bin (str); - str += i2varint_string (audio_->text_string_.length ()); + str += int2midi_varint_string (audio_->text_string_.length ()); str += audio_->text_string_; return str; } -Midi_track::Midi_track () - : Midi_chunk () -{ - // 4D 54 72 6B MTrk - // 00 00 00 3B chunk length (59) - // 00 FF 58 04 04 02 18 08 time signature - // 00 FF 51 03 07 A1 20 tempo - - // FF 59 02 sf mi Key Signature - // sf = -7: 7 flats - // sf = -1: 1 flat - // sf = 0: key of C - // sf = 1: 1 sharp - // sf = 7: 7 sharps - // mi = 0: major key - // mi = 1: minor key - - number_ = 0; - - char const *data_str0 = "" - // "00" "ff58" "0404" "0218" "08" - // "00" "ff51" "0307" "a120" - // why a key at all, in midi? - // key: C - // "00" "ff59" "02" "00" "00" - // key: F (scsii-menuetto) - // "00" "ff59" "02" "ff" "00" - ; - - std::string data_string; - // only for format 0 (currently using format 1)? - data_string += String_convert::hex2bin (data_str0); - - char const *footer_str0 = "00" "ff2f" "00"; - std::string footer_string = String_convert::hex2bin (footer_str0); - - set ("MTrk", data_string, footer_string); -} - -void -Midi_track::add (Moment delta_time_mom, Midi_item *midi) -{ - assert (delta_time_mom >= Moment (0)); - - Midi_event *e = new Midi_event (delta_time_mom, midi); - event_p_list_.append (new Killing_cons (e, 0)); -} - -std::string -Midi_track::data_string () const -{ - std::string str = Midi_chunk::data_string (); - if (do_midi_debugging_global) - str += "\n"; - for (Cons *i = event_p_list_.head_; i; i = i->next_) - { - str += i->car_->to_string (); - if (do_midi_debugging_global) - str += "\n"; - } - return str; -} - - char const * Midi_item::name () const {