release: 0.1.0

[lilypond.git] / lily / staff-performer.cc

diff --git a/lily/staff-performer.cc b/lily/staff-performer.cc
index b21bc5c45aee54db7435607ef2a7fa92788d713f..0d94d87ae758b5247f2816e08ee5b2396ac9e287 100644 (file)
--- a/lily/staff-performer.cc
+++ b/lily/staff-performer.cc
@@ -48,11 +48,18 @@ Staff_performer::header()
     Midi_text track_name( Midi_text::TRACK_NAME, instrument_str());
     midi_track_p_->add( Moment( 0 ), &track_name );
 
-    // set instrument :-)
+    // set instrument description
     Midi_text instrument_name( Midi_text::INSTRUMENT_NAME, instrument_str() );
     midi_track_p_->add( Moment( 0 ), &instrument_name );
 
-    
+    // set instrument :-)
+    // lieve wendy, nu heb je mijn track_i_ / get_staff_i weggehaald...
+    // zie ook note-performer: ugh
+    // ugh, need to know channel (===track===staff) too
+    int channel_i = track_i_;
+    Midi_instrument instrument( channel_i, instrument_str() );
+    midi_track_p_->add( Moment( 0 ), &instrument );
+
     Midi_tempo midi_tempo( get_tempo_i(  ) );
     midi_track_p_->add( Moment( 0 ), &midi_tempo );
 }
@@ -72,3 +79,18 @@ Staff_performer::play_event( Midi_item* l )
     midi_track_p_->add( delta_t, l);
 }
 
+
+//<ugh>
+int
+Staff_performer::get_track_i() const
+{
+    return track_i_;
+}
+
+void
+Staff_performer::set_track( int& track_i_r )
+{
+    track_i_ = track_i_r++;
+}
+//</ugh>
+