X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmidi-item.cc;h=1fcb259ae13c2c0b6b0ee94967476cd8099f3928;hb=907e4ec4b3d11754b9df79ecad0bad075f7b4ac9;hp=3fcdb4ca223d6c7ebea4a3b6e983cfc6cab6001d;hpb=8f5cd22af76fcb5c77853a5ede8b94ebef97caef;p=lilypond.git diff --git a/lily/midi-item.cc b/lily/midi-item.cc index 3fcdb4ca22..1fcb259ae1 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--2011 Jan Nieuwenhuizen - (c) 1997--2006 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" @@ -40,44 +51,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,47 +71,10 @@ 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) + : Midi_channel_item (a) + , audio_ (a) { - audio_ = a; audio_->str_ = String_convert::to_lower (audio_->str_); } @@ -140,14 +84,11 @@ 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); 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 ())); @@ -160,14 +101,9 @@ Midi_item::Midi_item () { } -Midi_channel_item::~Midi_channel_item () -{ - channel_ = 0; -} - -Midi_channel_item::Midi_channel_item () +Midi_channel_item::Midi_channel_item (Audio_item *ai) + : channel_ (ai->channel_) { - channel_ = 0; } Midi_item::~Midi_item () @@ -175,7 +111,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) @@ -198,8 +134,8 @@ Midi_item::i2varint_string (int i) } Midi_key::Midi_key (Audio_key *a) + : audio_ (a) { - audio_ = a; } string @@ -215,9 +151,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 @@ -243,16 +179,11 @@ 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; -} - -Moment -Midi_note::get_length () const -{ - Moment m = audio_->length_mom_; - return m; } int @@ -283,9 +214,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 +225,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; } @@ -310,17 +238,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_)); @@ -339,8 +264,9 @@ Midi_note_off::to_string () const } Midi_dynamic::Midi_dynamic (Audio_dynamic *a) + : Midi_channel_item (a) + , audio_ (a) { - audio_ = a; } string @@ -362,14 +288,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 @@ -391,8 +322,8 @@ Midi_piano_pedal::to_string () const } Midi_tempo::Midi_tempo (Audio_tempo *a) + : audio_ (a) { - audio_ = a; } string @@ -405,8 +336,8 @@ Midi_tempo::to_string () const } Midi_text::Midi_text (Audio_text *a) + : audio_ (a) { - audio_ = a; } string @@ -414,84 +345,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_); -}