X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmidi-item.cc;h=22176a87aabe21785066420f73b38ae979983ce0;hb=71cc3b4a5adf79c361d2af39f1a361a36a03f273;hp=53248be2631e13b350f8175c82bbdc08911cdd00;hpb=c096fc32f688080a3be3eb78ae92f7f1553584be;p=lilypond.git diff --git a/lily/midi-item.cc b/lily/midi-item.cc index 53248be263..22176a87aa 100644 --- a/lily/midi-item.cc +++ b/lily/midi-item.cc @@ -3,480 +3,377 @@ source file of the GNU LilyPond music typesetter - (c) 1997 Jan Nieuwenhuizen + (c) 1997--2002 Jan Nieuwenhuizen */ -#include "proto.hh" -#include "plist.hh" -#include "debug.hh" +#include "warn.hh" +#include "main.hh" #include "misc.hh" #include "string.hh" #include "string-convert.hh" -#include "command-request.hh" -#include "musical-request.hh" #include "midi-item.hh" #include "midi-stream.hh" #include "audio-item.hh" +#include "duration.hh" +#include "scm-option.hh" + +#include "killing-cons.tcc" + +Midi_item* +Midi_item::midi_p (Audio_item* a) +{ + if (Audio_key* i = dynamic_cast (a)) + return new Midi_key (i); + else if (Audio_instrument* i = dynamic_cast (a)) + return i->str_.length_i () ? 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)) + return new Midi_tempo (i); + 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_str_.length_i () ? new Midi_text (i) : 0; + return new Midi_text (i); + else + assert (0); + + // isn't C++ grand? + return 0; +} -IMPLEMENT_IS_TYPE_B(Midi_item); -IMPLEMENT_IS_TYPE_B1(Midi_chunk, Midi_item); -IMPLEMENT_IS_TYPE_B1(Midi_duration, Midi_item); -IMPLEMENT_IS_TYPE_B1(Midi_header, Midi_chunk); -IMPLEMENT_IS_TYPE_B1(Midi_instrument, Midi_item); -IMPLEMENT_IS_TYPE_B1(Midi_key,Midi_item); -IMPLEMENT_IS_TYPE_B1(Midi_meter, Midi_item); -IMPLEMENT_IS_TYPE_B1(Midi_note, Midi_item); -IMPLEMENT_IS_TYPE_B1(Midi_note_off, Midi_item); -IMPLEMENT_IS_TYPE_B1(Midi_tempo, Midi_item); -IMPLEMENT_IS_TYPE_B1(Midi_text, Midi_item); -IMPLEMENT_IS_TYPE_B1(Midi_track, Midi_chunk); - -Midi_chunk::Midi_chunk() - : Midi_item( 0 ) +void +Midi_chunk::set (String header_str, String data_str, String footer_str) +{ + data_str_ = data_str; + footer_str_ = footer_str; + header_str_ = header_str; +} + +String +Midi_chunk::data_str () const { + return data_str_; } -void -Midi_chunk::add( String str ) +String +Midi_chunk::str () const { - data_str_ += str; + String str = header_str_; + String dat = data_str (); + String length_str = String_convert::i2hex_str (dat.length_i () + + footer_str_.length_i (), 8, '0'); + length_str = String_convert::hex2bin_str (length_str); + str += length_str; + str += dat; + str += footer_str_; + return str; } -void -Midi_chunk::set( String header_str, String data_str, String footer_str ) +Midi_duration::Midi_duration (Real seconds_f) { - data_str_ = data_str; - footer_str_ = footer_str; - header_str_ = header_str; + seconds_f_ = seconds_f; } - + String -Midi_chunk::str() const +Midi_duration::str () const { - String str = header_str_; - String length_str = String_convert::i2hex_str( data_str_.length_i() + footer_str_.length_i(), 8, '0' ); - length_str = String_convert::hex2bin_str( length_str ); - str += length_str; - str += data_str_; - str += footer_str_; - return str; + return String (""; } -Midi_duration::Midi_duration( Real seconds_f ) - : Midi_item( 0 ) +Midi_event::Midi_event (Moment delta_mom, Midi_item* midi_p) { - seconds_f_ = seconds_f; + delta_mom_ = delta_mom; + midi_p_ = midi_p; } +/* + ugh. midi output badly broken since grace note hackage. + */ String -Midi_duration::str() const +Midi_event::str () const { - return String( ""; + 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_str = Midi_item::i2varint_str (delta_i); + String midi_str = midi_p_->str (); + assert (midi_str.length_i ()); + return delta_str + midi_str; } -Midi_header::Midi_header( int format_i, int tracks_i, int clocks_per_4_i ) - : Midi_chunk() + +Midi_header::Midi_header (int format_i, int tracks_i, int clocks_per_4_i) { - String str; + String str; - String format_str = String_convert::i2hex_str( format_i, 4, '0' ); - str += String_convert::hex2bin_str( format_str ); + String format_str = String_convert::i2hex_str (format_i, 4, '0'); + str += String_convert::hex2bin_str (format_str); - String tracks_str = String_convert::i2hex_str( tracks_i, 4, '0' ); - str += String_convert::hex2bin_str( tracks_str ); - - String tempo_str = String_convert::i2hex_str( clocks_per_4_i, 4, '0' ); - str += String_convert::hex2bin_str( tempo_str ); - - set( "MThd", str, "" ); -} - -char const* const instrument_name_sz_a_[ ] = { - - /* default is usually piano */ - /* 0 */ "piano", - - /* (1-8 piano) */ - /* 1 */ "acoustic grand", - /* 2 */ "bright acoustic", - /* 3 */ "electric grand", - /* 4 */ "honky-tonk", - /* 5 */ "electric piano 1", - /* 6 */ "electric piano 2", - /* 7 */ "harpsichord", - /* 8 */ "clav", - - /* (9-16 chrom percussion) */ - /* 9 */ "celesta", - /* 10 */ "glockenspiel", - /* 11 */ "music box", - /* 12 */ "vibraphone", - /* 13 */ "marimba", - /* 14 */ "xylophone", - /* 15 */ "tubular bells", - /* 16 */ "dulcimer", - - /* (17-24 organ) */ - /* 17 */ "drawbar organ", - /* 18 */ "percussive organ", - /* 19 */ "rock organ", - /* 20 */ "church organ", - /* 21 */ "reed organ", - /* 22 */ "accoridan", - /* 23 */ "harmonica", - /* 24 */ "tango accordian", - - /* (25-32 guitar) */ - /* 25 */ "acoustic guitar(nylon)", - /* 26 */ "acoustic guitar(steel)", - /* 27 */ "electric guitar(jazz)", - /* 28 */ "electric guitar(clean)", - /* 29 */ "electric guitar(muted)", - /* 30 */ "overdriven guitar", - /* 31 */ "distortion guitar", - /* 32 */ "guitar harmonics", - - /* (33-40 bass) */ - /* 33 */ "acoustic bass", - /* 34 */ "electric bass(finger)", - /* 35 */ "electric bass(pick)", - /* 36 */ "fretless bass", - /* 37 */ "slap bass 1", - /* 38 */ "slap bass 2", - /* 39 */ "synth bass 1", - /* 40 */ "synth bass 2", - - /* (41-48 strings) */ - /* 41 */ "violin", - /* 42 */ "viola", - /* 43 */ "cello", - /* 44 */ "contrabass", - /* 45 */ "tremolo strings", - /* 46 */ "pizzicato strings", - /* 47 */ "orchestral strings", - /* 48 */ "timpani", - - /* (49-56 ensemble) */ - /* 49 */ "string ensemble 1", - /* 50 */ "string ensemble 2", - /* 51 */ "synthstrings 1", - /* 52 */ "synthstrings 2", - /* 53 */ "choir aahs", - /* 54 */ "voice oohs", - /* 55 */ "synth voice", - /* 56 */ "orchestra hit", - - /* (57-64 brass) */ - /* 57 */ "trumpet", - /* 58 */ "trombone", - /* 59 */ "tuba", - /* 60 */ "muted trumpet", - /* 61 */ "french horn", - /* 62 */ "brass section", - /* 63 */ "synthbrass 1", - /* 64 */ "synthbrass 2", - - /* (65-72 reed) */ - /* 65 */ "soprano sax", - /* 66 */ "alto sax", - /* 67 */ "tenor sax", - /* 68 */ "baritone sax", - /* 69 */ "oboe", - /* 70 */ "english horn", - /* 71 */ "bassoon", - /* 72 */ "clarinet", - - /* (73-80 pipe) */ - /* 73 */ "piccolo", - /* 74 */ "flute", - /* 75 */ "recorder", - /* 76 */ "pan flute", - /* 77 */ "blown bottle", - /* 78 */ "skakuhachi", - /* 79 */ "whistle", - /* 80 */ "ocarina", - - /* (81-88 synth lead) */ - /* 81 */ "lead 1 (square)", - /* 82 */ "lead 2 (sawtooth)", - /* 83 */ "lead 3 (calliope)", - /* 84 */ "lead 4 (chiff)", - /* 85 */ "lead 5 (charang)", - /* 86 */ "lead 6 (voice)", - /* 87 */ "lead 7 (fifths)", - /* 88 */ "lead 8 (bass+lead)", - - /* (89-96 synth pad) */ - /* 89 */ "pad 1 (new age)", - /* 90 */ "pad 2 (warm)", - /* 91 */ "pad 3 (polysynth)", - /* 92 */ "pad 4 (choir)", - /* 93 */ "pad 5 (bowed)", - /* 94 */ "pad 6 (metallic)", - /* 95 */ "pad 7 (halo)", - /* 96 */ "pad 8 (sweep)", - - /* (97-104 synth effects) */ - /* 97 */ "fx 1 (rain)", - /* 98 */ "fx 2 (soundtrack)", - /* 99 */ "fx 3 (crystal)", - /* 100 */ "fx 4 (atmosphere)", - /* 101 */ "fx 5 (brightness)", - /* 102 */ "fx 6 (goblins)", - /* 103 */ "fx 7 (echoes)", - /* 104 */ "fx 8 (sci-fi)", - - /* (105-112 ethnic) */ - /* 105 */ "sitar", - /* 106 */ "banjo", - /* 107 */ "shamisen", - /* 108 */ "koto", - /* 109 */ "kalimba", - /* 110 */ "bagpipe", - /* 111 */ "fiddle", - /* 112 */ "shanai", - - /* (113-120 percussive) */ - /* 113 */ "tinkle bell", - /* 114 */ "agogo", - /* 115 */ "steel drums", - /* 116 */ "woodblock", - /* 117 */ "taiko drum", - /* 118 */ "melodic tom", - /* 119 */ "synth drum", - /* 120 */ "reverse cymbal", - - /* (121-128 sound effects) */ - /* 121 */ "guitar fret noise", - /* 122 */ "breath noise", - /* 123 */ "seashore", - /* 124 */ "bird tweet", - /* 125 */ "telephone ring", - /* 126 */ "helicopter", - /* 127 */ "applause", - /* 128 */ "gunshot", - 0 -}; - -Midi_instrument::Midi_instrument( int channel_i, String instrument_str ) - : Midi_item( 0 ) -{ - instrument_str_ = instrument_str; - instrument_str_.to_lower(); - channel_i_ = channel_i; -} - + String tracks_str = String_convert::i2hex_str (tracks_i, 4, '0'); + str += String_convert::hex2bin_str (tracks_str); + + String tempo_str = String_convert::i2hex_str (clocks_per_4_i, 4, '0'); + str += String_convert::hex2bin_str (tempo_str); + + set ("MThd", str, ""); +} + +Midi_instrument::Midi_instrument (Audio_instrument* a) +{ + audio_l_ = a; + audio_l_->str_.to_lower (); +} + String Midi_instrument::str() const { - Byte program_byte = 0; - for ( int i = 0; instrument_name_sz_a_[i]; i++ ) - if ( instrument_str_ == String(instrument_name_sz_a_[ i ] )) { - program_byte = (Byte)i; - break; - } - - if ( !program_byte ) - return String( "" ); + Byte program_byte = 0; + bool found = false; + SCM proc = scm_primitive_eval (ly_symbol2scm ("midi-program")); + SCM program = gh_call1 (proc, ly_symbol2scm (audio_l_->str_.ch_C())); + found = (program != SCM_BOOL_F); + if (found) + program_byte = gh_scm2int(program); + else + warning (_f ("no such instrument: `%s'", audio_l_->str_.ch_C ())); - String str = String( (char)( 0xc0 + channel_i_ ) ); - str += String( (char)program_byte ); - return str; + String str = to_str ((char) (0xc0 + channel_i_)); //YIKES! FIXME: Should be track. -rz + str += to_str ((char)program_byte); + return str; } -Midi_item::Midi_item( Audio_item* audio_item_l ) +Midi_item::Midi_item () { - audio_item_l_ = audio_item_l; - channel_i_ = 0; + channel_i_ = 0; } -void -Midi_item::output( Midi_stream* midi_stream_l ) const +Midi_item::~Midi_item () { - *midi_stream_l << str(); } String -Midi_item::i2varint_str( int i ) -{ - int buffer_i = i & 0x7f; - while ( (i >>= 7) > 0 ) { - buffer_i <<= 8; - buffer_i |= 0x80; - buffer_i += (i & 0x7f); +Midi_item::i2varint_str (int i) +{ + int buffer_i = i & 0x7f; + while ((i >>= 7) > 0) + { + buffer_i <<= 8; + buffer_i |= 0x80; + buffer_i += (i & 0x7f); } - String str; - while ( 1 ) { - str += (char)buffer_i; - if ( buffer_i & 0x80 ) - buffer_i >>= 8; - else - break; + String str; + while (1) + { + str += to_str ((char)buffer_i); + if (buffer_i & 0x80) + buffer_i >>= 8; + else + break; } - return str; + return str; } -Midi_key::Midi_key( Audio_item* audio_item_l ) - : Midi_item( audio_item_l ) +Midi_key::Midi_key (Audio_key*a) { + audio_l_ = a; } String -Midi_key::str() const +Midi_key::str () const { - Key_change_req* k = audio_item_l_->req_l_->command()->keychange(); - int sharps_i = k->sharps_i(); - int flats_i = k->flats_i(); - - // midi cannot handle non-conventional keys - if ( flats_i && sharps_i ) - return ""; - int accidentals_i = sharps_i - flats_i; - - String str = "ff5902"; - str += String_convert::i2hex_str( accidentals_i, 2, '0' ); - int minor_i = k->minor_b(); - str += String_convert::i2hex_str( minor_i, 2, '0' ); - return String_convert::hex2bin_str( str ); + String str = "ff5902"; + str += String_convert::i2hex_str (audio_l_->accidentals_, 2, '0'); + if (audio_l_->major_) + str += String_convert::i2hex_str (0, 2, '0'); + else + str += String_convert::i2hex_str (1, 2, '0'); + return String_convert::hex2bin_str (str); } -Midi_meter::Midi_meter( Audio_item* audio_item_l ) - : Midi_item( audio_item_l ) +Midi_time_signature::Midi_time_signature (Audio_time_signature* a) { - clocks_per_1_i_ = 18; + audio_l_ = a; + clocks_per_1_i_ = 18; } String -Midi_meter::str() const +Midi_time_signature::str () const { - Meter_change_req* m = audio_item_l_->req_l_->command()->meterchange(); - int num_i = m->beats_i_; - int den_i = m->one_beat_i_; + int num = audio_l_->beats_i_; + int den = audio_l_->one_beat_i_; - String str = "ff5804"; - str += String_convert::i2hex_str( num_i, 2, '0' ); - str += String_convert::i2hex_str( intlog2( den_i ) , 2, '0' ); - str += String_convert::i2hex_str( clocks_per_1_i_, 2, '0' ); - str += String_convert::i2hex_str( 8, 2, '0' ); - return String_convert::hex2bin_str( str ); + String str = "ff5804"; + str += String_convert::i2hex_str (num, 2, '0'); + str += String_convert::i2hex_str (intlog2 (den) , 2, '0'); + str += String_convert::i2hex_str (clocks_per_1_i_, 2, '0'); + str += String_convert::i2hex_str (8, 2, '0'); + return String_convert::hex2bin_str (str); } -Midi_note::Midi_note( Audio_item* audio_item_l ) - : Midi_item( audio_item_l ) +Midi_note::Midi_note (Audio_note* a) { - dynamic_byte_ = 0x7f; + audio_l_ = a; + dynamic_byte_ = 0x7f; } Moment -Midi_note::duration() const +Midi_note::length_mom () const { - return audio_item_l_->req_l_->musical()->rhythmic()->duration(); + Moment m = audio_l_->length_mom_; +#if 0 + //junkme? + if (m < Moment (Rational (1, 1000))) + { + warning (_ ("silly duration")); + m = 1; + } +#endif + return m; } int -Midi_note::pitch_i() const +Midi_note::pitch_i () const { - return audio_item_l_->req_l_->musical()->melodic()->pitch(); + int p = audio_l_->pitch_.semitone_pitch () + audio_l_->transposing_i_; + if (p == INT_MAX) + { + warning (_ ("silly pitch")); + p = 0; + } + return p; } String -Midi_note::str() const +Midi_note::str () const { - if ( pitch_i() == INT_MAX ) - return String( "" ); + Byte status_byte = (char) (0x90 + channel_i_); - Byte status_byte = (char)( 0x90 + channel_i_ ); + String str = to_str ((char)status_byte); + str += to_str ((char) (pitch_i () + c0_pitch_i_c_)); - String str = String( (char)status_byte ); - str += (char)( pitch_i() + c0_pitch_i_c_ ); + str += to_str ((char)dynamic_byte_); + return str; +} - // poor man's staff dynamics: - str += (char)( dynamic_byte_ - 0x10 * channel_i_ ); +Midi_note_off::Midi_note_off (Midi_note* n) + : Midi_note (n->audio_l_) +{ + on_l_ = n; + channel_i_ = n->channel_i_; - return str; + // 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; } -Midi_note_off::Midi_note_off( Midi_note* midi_note_l ) - : Midi_item( midi_note_l->audio_item_l_ ) +String +Midi_note_off::str () const { - // 0x64 is supposed to be neutral, but let's try - aftertouch_byte_ = 0x64; - channel_i_ = midi_note_l->channel_i_; + Byte status_byte = (char) (0x80 + channel_i_); + + String str = to_str ((char)status_byte); + str += to_str ((char) (pitch_i () + Midi_note::c0_pitch_i_c_)); + str += to_str ((char)aftertouch_byte_); + return str; } -int -Midi_note_off::pitch_i() const +Midi_dynamic::Midi_dynamic (Audio_dynamic* a) { - return audio_item_l_->req_l_->musical()->melodic()->pitch(); + audio_l_ = a; } String -Midi_note_off::str() const +Midi_dynamic::str () const { - if ( pitch_i() == INT_MAX ) - return String( "" ); + Byte status_byte = (char) (0xB0 + channel_i_); + String str = to_str ((char)status_byte); - Byte status_byte = (char)( 0x80 + channel_i_ ); + /* + Main volume controller (per channel): + 07 MSB + 27 LSB + */ + static Real const full_scale = 127; + + int volume = (int) (audio_l_->volume_*full_scale); + if (volume <= 0) + volume = 1; + if (volume > full_scale) + volume = (int)full_scale; - String str = String( (char)status_byte ); - str += (char)( pitch_i() + Midi_note::c0_pitch_i_c_ ); - str += (char)aftertouch_byte_; - return str; + str += to_str ((char)0x07); + str += to_str ((char)volume); + return str; } -Midi_tempo::Midi_tempo( Audio_item* audio_item_l ) - : Midi_item( audio_item_l ) +Midi_piano_pedal::Midi_piano_pedal (Audio_piano_pedal* a) { - per_minute_4_i_ = ( (Audio_tempo*)audio_item_l_ )->per_minute_4_i_; + audio_l_ = a; } -Midi_tempo::Midi_tempo( int per_minute_4_i ) - : Midi_item( 0 ) +String +Midi_piano_pedal::str () const { - per_minute_4_i_ = per_minute_4_i; + Byte status_byte = (char) (0xB0 + channel_i_); + String str = to_str ((char)status_byte); + + if (audio_l_->type_str_ == "Sostenuto") + str += to_str ((char)0x42); + else if (audio_l_->type_str_ == "Sustain") + str += to_str ((char)0x40); + else if (audio_l_->type_str_ == "UnaCorda") + str += to_str ((char)0x43); + + int pedal = ((1 - audio_l_->dir_) / 2) * 0x7f; + str += to_str ((char)pedal); + return str; } -String -Midi_tempo::str() const +Midi_tempo::Midi_tempo (Audio_tempo* a) { - int useconds_per_4_i = 60 * (int)1e6 / per_minute_4_i_; - String str = "ff5103"; - str += String_convert::i2hex_str( useconds_per_4_i, 6, '0' ); - return String_convert::hex2bin_str( str ); + audio_l_ = a; } -Midi_text::Midi_text( Audio_item* audio_item_l ) - : Midi_item( audio_item_l ) +String +Midi_tempo::str () const { - text_str_ = ( (Audio_text*)audio_item_l_ )->text_str_; - type_ = (Type)( (Audio_text*)audio_item_l_ )->type_; + int useconds_per_4_i = 60 * (int)1e6 / audio_l_->per_minute_4_i_; + String str = "ff5103"; + str += String_convert::i2hex_str (useconds_per_4_i, 6, '0'); + return String_convert::hex2bin_str (str); } -Midi_text::Midi_text( Midi_text::Type type, String text_str ) - : Midi_item( 0 ) +Midi_text::Midi_text (Audio_text* a) { - text_str_ = text_str; - type_ = type; + audio_l_ = a; } String -Midi_text::str() const +Midi_text::str () const { - String str = "ff" + String_convert::i2hex_str( type_, 2, '0' ); - str = String_convert::hex2bin_str( str ); - str += i2varint_str( text_str_.length_i() ); - str += text_str_; - return str; + String str = "ff" + String_convert::i2hex_str (audio_l_->type_, 2, '0'); + str = String_convert::hex2bin_str (str); + str += i2varint_str (audio_l_->text_str_.length_i ()); + str += audio_l_->text_str_; + return str; } -Midi_track::Midi_track() - : Midi_chunk() +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 + // 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 @@ -487,47 +384,48 @@ Midi_track::Midi_track() // mi = 0: major key // mi = 1: minor key - number_i_ = 0; + number_i_ = 0; - char const* data_ch_C = "" -// "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" + char const* data_ch_C = "" + // "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_str; - // only for format 0 (currently using format 1)? - data_str += String_convert::hex2bin_str( data_ch_C ); + String data_str; + // only for format 0 (currently using format 1)? + data_str += String_convert::hex2bin_str (data_ch_C); - char const* footer_ch_C = "00" "ff2f" "00"; - String footer_str = String_convert::hex2bin_str( footer_ch_C ); + char const* footer_ch_C = "00" "ff2f" "00"; + String footer_str = String_convert::hex2bin_str (footer_ch_C); - set( "MTrk", data_str, footer_str ); + set ("MTrk", data_str, footer_str); } void -Midi_track::add( int delta_time_i, String event_str ) +Midi_track::add (Moment delta_time_mom, Midi_item* midi_p) { - if ( delta_time_i < 0 ) { - cout << String_convert::bin2hex_str( i2varint_str( delta_time_i ) ) << endl; - cout << String_convert::bin2hex_str( event_str ) << endl; - } - assert(delta_time_i >= 0); - assert(event_str.length_i()); - Midi_chunk::add( i2varint_str( delta_time_i ) + event_str ); -} + assert (delta_time_mom >= Moment (0)); -void -Midi_track::add( Moment delta_time_moment, Midi_item* mitem_l ) -{ - // use convention of 384 clocks per 4 - // use Duration_convert - int delta_time_i = delta_time_moment * Moment( 384 ) / Moment( 1, 4 ); - // ? int ( delta_time_moment * 4 * 384) - add( delta_time_i, mitem_l->str() ); + Midi_event * e = new Midi_event (delta_time_mom, midi_p); + event_p_list_.append (new Killing_cons (e, 0)); } +String +Midi_track::data_str () const +{ + String str = Midi_chunk::data_str (); + if (midi_debug_global_b) + str += "\n"; + for (Cons *i=event_p_list_.head_; i; i = i->next_) + { + str += i->car_->str (); + if (midi_debug_global_b) + str += "\n"; + } + return str; +}