release: 0.1.0

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

diff --git a/lily/staff-performer.cc b/lily/staff-performer.cc
index 856551f90aeb460b3c4a2aed38e3ba80b643adee..0d94d87ae758b5247f2816e08ee5b2396ac9e287 100644 (file)
--- a/lily/staff-performer.cc
+++ b/lily/staff-performer.cc
@@ -1,13 +1,68 @@
 /*
   staff-performer.cc -- implement Staff_performer
 
-  (c) 1996, 1997 Han-Wen Nienhuys <hanwen@stack.nl>
-                 Jan Nieuwenhuizen <jan@digicash.com>
+  (c) 1996, 1997 Jan Nieuwenhuizen <jan@digicash.com>
  */
 
-#if 0
 
 #include "staff-performer.hh"
+#include "translator.hh"
+#include "input-translator.hh"
+#include "debug.hh"
+#include "midi-def.hh"
+#include "midi-item.hh"
+#include "midi-stream.hh"
+#include "string.hh"
+#include "string-convert.hh"
+
+
+IMPLEMENT_IS_TYPE_B1(Staff_performer,Performer_group_performer);
+ADD_THIS_PERFORMER(Staff_performer);
+
+Staff_performer::Staff_performer()
+{
+    midi_mom_ = 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_;
+}
+
+void
+Staff_performer::header()
+{
+    // set track name
+    Midi_text track_name( Midi_text::TRACK_NAME, instrument_str());
+    midi_track_p_->add( Moment( 0 ), &track_name );
+
+    // 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 );
+}
 
 String 
 Staff_performer::instrument_str() 
@@ -16,10 +71,26 @@ Staff_performer::instrument_str()
 }
 
 void 
-Staff_performer::play_event( Midi_item i )
+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);
+}
+
+
+//<ugh>
+int
+Staff_performer::get_track_i() const
+{
+    return track_i_;
+}
+
+void
+Staff_performer::set_track( int& track_i_r )
 {
-    i.track_i_ = midi_track_i_;
-    Performer::play_event( i );
+    track_i_ = track_i_r++;
 }
+//</ugh>
 
-#endif