X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmidi-item.cc;h=b2f1231ae19559364e849f9e397be2f789df8a4b;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=3fcdb4ca223d6c7ebea4a3b6e983cfc6cab6001d;hpb=af770f3440264c18ce01525dce1aa76b86ace0d5;p=lilypond.git diff --git a/lily/midi-item.cc b/lily/midi-item.cc index 3fcdb4ca22..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" @@ -40,44 +40,14 @@ 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 (string header_string, string data_string, string footer_string) -{ - data_string_ = data_string; - footer_string_ = footer_string; - header_string_ = header_string; -} - -string -Midi_chunk::data_string () const -{ - return data_string_; -} -string -Midi_chunk::to_string () const -{ - string str = header_string_; - string dat = data_string (); - 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) { @@ -90,44 +60,6 @@ Midi_duration::to_string () const return 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. -*/ -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 = rat_dt.to_int (); - - string delta_string = Midi_item::i2varint_string (delta); - string midi_string = midi_->to_string (); - assert (midi_string.length ()); - return delta_string + midi_string; -} - -Midi_header::Midi_header (int format, int tracks, int clocks_per_4) -{ - string str; - - string format_string = String_convert::int2hex (format, 4, '0'); - str += String_convert::hex2bin (format_string); - - string tracks_string = String_convert::int2hex (tracks, 4, '0'); - str += String_convert::hex2bin (tracks_string); - - string tempo_string = String_convert::int2hex (clocks_per_4, 4, '0'); - str += String_convert::hex2bin (tempo_string); - - set ("MThd", str, ""); -} - Midi_instrument::Midi_instrument (Audio_instrument *a) { audio_ = a; @@ -140,9 +72,6 @@ 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); @@ -160,11 +89,6 @@ Midi_item::Midi_item () { } -Midi_channel_item::~Midi_channel_item () -{ - channel_ = 0; -} - Midi_channel_item::Midi_channel_item () { channel_ = 0; @@ -175,7 +99,7 @@ Midi_item::~Midi_item () } string -Midi_item::i2varint_string (int i) +int2midi_varint_string (int i) { int buffer = i & 0x7f; while ((i >>= 7) > 0) @@ -248,12 +172,6 @@ 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 @@ -283,9 +201,6 @@ 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. @@ -297,9 +212,9 @@ Midi_note::to_string () const str += ::to_string ((char) (0x00)); } - str += ::to_string ((char)status_byte); + 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; } @@ -414,84 +329,13 @@ Midi_text::to_string () const { 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" - ; - - 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"; - 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); - events_.push_back (e); -} - -string -Midi_track::data_string () const -{ - string str = Midi_chunk::data_string (); - if (do_midi_debugging_global) - str += "\n"; - - for (vector::const_iterator i (events_.begin()); - i != events_.end(); i ++) - { - str += (*i)->to_string (); - if (do_midi_debugging_global) - str += "\n"; - } - return str; -} - - char const * Midi_item::name () const { return this->class_name (); } - -Midi_track::~Midi_track () -{ - junk_pointers (events_); -}