From 87e4f9384bcb3bea5f4e2165f776999f0a96c7e0 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sun, 28 Sep 2003 11:06:14 +0000 Subject: [PATCH] (operator <<): Also write MIDI string when midi_debug_global_b. (operator <<): Normalise loop. --- ChangeLog | 6 ++++++ lily/midi-stream.cc | 33 +++++++++++++-------------------- 2 files changed, 19 insertions(+), 20 deletions(-) diff --git a/ChangeLog b/ChangeLog index 846b1d6d65..37f8e23ab3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2003-09-28 Jan Nieuwenhuizen + + * lily/midi-stream.cc (operator <<): Also write MIDI string when + midi_debug_global_b. + (operator <<): Normalise loop. + 2003-09-27 Han-Wen Nienhuys * scripts/lilypond.py (escape_path): revise. diff --git a/lily/midi-stream.cc b/lily/midi-stream.cc index 1013a5068a..221658a71d 100644 --- a/lily/midi-stream.cc +++ b/lily/midi-stream.cc @@ -31,12 +31,17 @@ Midi_stream::~Midi_stream () Midi_stream& Midi_stream::operator << (String str) { - Byte * b = str.get_bytes (); + Byte *b = str.get_bytes (); +#if 0 for (int sz = str.length (); sz--;) { fputc (*b, out_file_); b++; } +#else + for (int i = 0, n = str.length (); i < n; i++) + fputc (b[i], out_file_); +#endif return *this; } @@ -45,30 +50,18 @@ Midi_stream::operator << (Midi_item const& midi_c_r) { String str = midi_c_r.to_string (); - + // ugh, should have separate debugging output with Midi*::print routines if (midi_debug_global_b) { - str = String_convert::bin2hex (str) + "\n"; - // ugh, should have separate debugging output with Midi*::print routines - int i = str.index ("0a"); - while (i >= 0) - { - str[i] = '\n'; - str[i + 1] = '\t'; - i = str.index ("0a"); - } - } - else - { - Byte * b = str.get_bytes (); - for (int sz = str.length (); sz--;) + str = String_convert::bin2hex (str) + "\n"; + for (int i = str.index ("0a"); i >= 0; i = str.index ("0a")) { - fputc (*b, out_file_); - b++; + str[i] = '\n'; + str[i + 1] = '\t'; } } - - return *this; + + return operator << (str); } Midi_stream& -- 2.39.5