release: 1.1.43

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

diff --git a/lily/midi-item.cc b/lily/midi-item.cc
index e52027345cc4c28ec05abbba568f231fbbb9b357..b358e1843359de320537accbd7e5a50d1a3723b8 100644 (file)
--- a/lily/midi-item.cc
+++ b/lily/midi-item.cc
@@ -293,13 +293,19 @@ String
 Midi_instrument::str () const
 {
   Byte program_byte = 0;
-  for (int i = 0; instrument_name_sz_a_[i]; i++)
+  bool found = false;
+  for (int i = 0; !found && instrument_name_sz_a_[i]; i++)
     if (instrument_str_ == String (instrument_name_sz_a_[ i ])) 
       {
        program_byte = (Byte)i;
-       break;
+       found = true;
       }
 
+  if (!found)
+    {
+      warning (_f("No such instrument: `%s'", instrument_str_.ch_C ()));
+    }
+  
   String str = to_str ((char) (0xc0 + channel_i_));
   str += to_str ((char)program_byte);
   return str;
@@ -552,9 +558,9 @@ Midi_track::data_str () const
   String str = Midi_chunk::data_str ();
   if (check_debug && !monitor->silent_b ("Midistrings"))
     str += "\n";
-  for (Cons<Midi_event>* i = event_p_list_.head_cons_p_; i; i = i->next_cons_p_) 
+  for (Cons<Midi_event> *i=event_p_list_.head_; i; i = i->next_) 
     {
-      str += i->car_p_->str ();
+      str += i->car_->str ();
       if (check_debug && !monitor->silent_b ("Midistrings"))
         str += "\n";
     }