partial: 0.1.7.jcn

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

diff --git a/lily/score-performer.cc b/lily/score-performer.cc
index 0ff49514e0e54570b3e28a9c6e99ad9de9c13476..bb05c0f16a88ac815f1b550c1be64e4294639ecc 100644 (file)
--- a/lily/score-performer.cc
+++ b/lily/score-performer.cc
@@ -1,6 +1,8 @@
 /*
   score-performer.cc -- implement Score_performer
 
+  source file of the GNU LilyPond music typesetter
+  
   (c) 1996, 1997 Jan Nieuwenhuizen <jan@digicash.com>
  */
 
@@ -8,6 +10,9 @@
 #include "score-performer.hh"
 #include "input-translator.hh"
 #include "midi-def.hh"
+#include "audio-item.hh"
+#include "audio-column.hh"
+#include "audio-score.hh"
 #include "midi-item.hh"
 #include "midi-stream.hh"
 #include "string-convert.hh"
@@ -47,25 +52,33 @@ Score_performer::finish()
     Performer_group_performer::do_removal_processing();
 
 
-    Midi_stream output_stream( midi_l_->outfile_str_, midi_item_p_arr_.size() + 1, 384 );    
+    Midi_stream output_stream( midi_l_->outfile_str_, midi_item_l_arr_.size() + 1, 384 );    
     *mlog << "MIDI output to " << midi_l_->outfile_str_ << " ..." << endl;    
 
-    header( output_stream);        
-    int track_i = 1;
-    for (int i=0; i<  midi_item_p_arr_.size(); i++) {
-       Midi_item * it_p = midi_item_p_arr_[i];
+    header( output_stream);
+//    int track_i = 1;
+    for (int i=0; i<  midi_item_l_arr_.size(); i++) {
+       Midi_item * it_p = midi_item_l_arr_[i];
        
-       if ( it_p->is_type_b( Midi_track::static_name()))
-           ((Midi_track*)it_p )->number_i_ = track_i ++;
+//     if ( it_p->is_type_b( Midi_track::static_name()))
+//         ((Midi_track*)it_p )->number_i_ = track_i ++;
        output_stream<< *it_p;
     }
+    *output_stream.os_p_ << flush;
     *mlog << endl;
 }
 
 void
-Score_performer::play_event(Midi_item*m)
+Score_performer::play( Audio_item* l )
+{
+    l->audio_column_l_ = audio_column_l_;
+    audio_column_l_->add( l );
+}
+
+void
+Score_performer::play( Midi_item* l )
 {
-    midi_item_p_arr_.push(m);
+    midi_item_l_arr_.push( l );
 }
 
 Moment
@@ -104,6 +117,9 @@ Score_performer::header(Midi_stream &output_stream)
                          + String_convert::i2dec_str( 0, 0, '0' ) );
     midi_track.add( Moment( 0 ), &track_name );
 
+    Midi_tempo tempo ( get_tempo_i() );
+    midi_track.add( Moment(0), &tempo);
+
     output_stream  << midi_track;
 }
 
@@ -111,6 +127,9 @@ void
 Score_performer::prepare( Moment m )
 {
     now_mom_ = m;
+    audio_column_l_ = new Audio_column( m );
+    
+    score_l_->audio_score_p_->add( audio_column_l_ );
 }
 
 void 
@@ -130,6 +149,11 @@ Score_performer::set_score(Score* score_l )
 void
 Score_performer::start()
 {
+    //<ugh>
+    int track_i = 1;
+    Performer_group_performer::set_track( track_i );
+    //</ugh>
+
     if ( midi_l_->outfile_str_ == "" )
        midi_l_->outfile_str_ = default_out_fn + ".midi";
 }