patch::: 1.3.132.jcn2

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

diff --git a/lily/midi-item.cc b/lily/midi-item.cc
index a44155c07318cbeb05ae9fbf5436584ab1234a10..64aa262a260c83559f900b3bd26f77499fe80b52 100644 (file)
--- a/lily/midi-item.cc
+++ b/lily/midi-item.cc
@@ -7,6 +7,7 @@
  */
 
 #include "debug.hh"
+#include "main.hh"
 #include "misc.hh"
 #include "string.hh"
 #include "string-convert.hh"
@@ -594,26 +595,16 @@ Midi_track::add (Moment delta_time_mom, Midi_item* midi_p)
   event_p_list_.append (new Killing_cons<Midi_event> (e, 0));
 }
 
-extern bool verbose_global_b;
-
 String
 Midi_track::data_str () const
 {
   String str = Midi_chunk::data_str ();
-#if 0
-  if (flower_dstream && !flower_dstream->silent_b ("Midistrings"))
-#else
-  if (verbose_global_b)
-#endif
+  if (midi_debug_global_b)
     str += "\n";
   for (Cons<Midi_event> *i=event_p_list_.head_; i; i = i->next_) 
     {
       str += i->car_->str ();
-#if 0
-      if (flower_dstream && !flower_dstream->silent_b ("Midistrings"))
-#else  
-      if (verbose_global_b)
-#endif 
+      if (midi_debug_global_b)
         str += "\n";
     }
   return str;