release: 1.3.19

[lilypond.git] / lily / midi-item.cc

diff --git a/lily/midi-item.cc b/lily/midi-item.cc
index 055d6785b3894810ff0def9e86bb0da711bf6f18..aeaa53ffa2a903fd8f6bfc20724c3d8edb920c2d 100644 (file)
--- a/lily/midi-item.cc
+++ b/lily/midi-item.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1999 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c)  1997--2000 Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
 #include "proto.hh"
@@ -88,7 +88,8 @@ Midi_event::Midi_event (Moment delta_mom, Midi_item* midi_p)
 String
 Midi_event::str () const
 {
-  int delta_i = delta_mom_ * Moment (Duration::division_1_i_s);
+  int delta_i = delta_mom_ * Moment (384 * 4); // ugh.
+
   String delta_str = Midi_item::i2varint_str (delta_i);
   String midi_str = midi_p_->str ();
   assert (midi_str.length_i ());
@@ -112,7 +113,10 @@ Midi_header::Midi_header (int format_i, int tracks_i, int clocks_per_4_i)
   set ("MThd", str, "");
 }
 
+
 /* why doesn't this start at 0 ?
+
+   TODO: -> IN GUILE!
  */
 char const* const instrument_name_sz_a_[ ] = {
   /* default is usually piano */
@@ -544,12 +548,12 @@ String
 Midi_track::data_str () const
 {
   String str = Midi_chunk::data_str ();
-  if (check_debug && !lily_monitor->silent_b ("Midistrings"))
+  if (flower_dstream && !flower_dstream->silent_b ("Midistrings"))
     str += "\n";
   for (Cons<Midi_event> *i=event_p_list_.head_; i; i = i->next_) 
     {
       str += i->car_->str ();
-      if (check_debug && !lily_monitor->silent_b ("Midistrings"))
+      if (flower_dstream && !flower_dstream->silent_b ("Midistrings"))
         str += "\n";
     }
   return str;