release: 0.0.77.jcn1

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

diff --git a/lily/staff-performer.cc b/lily/staff-performer.cc
index 1ffffd7ab08d74cda72219f71775cfd414bc602e..b21bc5c45aee54db7435607ef2a7fa92788d713f 100644 (file)
--- a/lily/staff-performer.cc
+++ b/lily/staff-performer.cc
@@ -15,34 +15,45 @@
 #include "string.hh"
 #include "string-convert.hh"
 
-IMPLEMENT_STATIC_NAME(Staff_performer);
+
 IMPLEMENT_IS_TYPE_B1(Staff_performer,Performer_group_performer);
 ADD_THIS_PERFORMER(Staff_performer);
 
 Staff_performer::Staff_performer()
 {
     midi_mom_ = 0;
-    track_i_ = 0;
-    midi_track_p_ = 0;
+    midi_track_p_ = new Midi_track;
+}
+void
+Staff_performer::do_creation_processing()
+{
+    header();
+}
+
+void
+Staff_performer::do_removal_processing()
+{
+    Performer::play_event( midi_track_p_);
 }
 
 Staff_performer::~Staff_performer()
 {
-     delete midi_track_p_;
+    delete midi_track_p_;
 }
 
 void
 Staff_performer::header()
 {
     // set track name
-    Midi_text track_name( Midi_text::TRACK_NAME, "Track " + String_convert::i2dec_str( track_i_, 0, '0' ) );
+    Midi_text track_name( Midi_text::TRACK_NAME, instrument_str());
     midi_track_p_->add( Moment( 0 ), &track_name );
 
     // set instrument :-)
     Midi_text instrument_name( Midi_text::INSTRUMENT_NAME, instrument_str() );
     midi_track_p_->add( Moment( 0 ), &instrument_name );
 
-    Midi_tempo midi_tempo( midi_l_->get_tempo_i( Moment( 1, 4 ) ) );
+    
+    Midi_tempo midi_tempo( get_tempo_i(  ) );
     midi_track_p_->add( Moment( 0 ), &midi_tempo );
 }
 
@@ -52,28 +63,12 @@ Staff_performer::instrument_str()
     return Translator::id_str_; 
 }
 
-void
-Staff_performer::midi_output( Midi_stream* midi_stream_l )
-{
-    *mlog << "[" << track_i_ << "]";
-    *midi_stream_l << *midi_track_p_;
-}
-
 void 
 Staff_performer::play_event( Midi_item* l )
 {
     Moment mom = get_mom();
     Moment delta_t = mom - midi_mom_ ;
     midi_mom_ += delta_t;
-    midi_track_p_->add( delta_t, l );    
-}
-
-void
-Staff_performer::set_track( Midi_def* midi_l, int& track_i_r ) 
-{ 
-    midi_l_ = midi_l;
-    track_i_ = track_i_r++;
-    midi_track_p_ = new Midi_track( track_i_ );
-    header();
+    midi_track_p_->add( delta_t, l);
 }