release: 0.0.77.jcn1

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

diff --git a/lily/score-performer.cc b/lily/score-performer.cc
index 2e3853964609b2f35fb0a7b037405afbbc23f7e0..0ff49514e0e54570b3e28a9c6e99ad9de9c13476 100644 (file)
--- a/lily/score-performer.cc
+++ b/lily/score-performer.cc
@@ -18,18 +18,15 @@
 #include "source.hh"
 
 IMPLEMENT_IS_TYPE_B1(Score_performer,Performer_group_performer);
-IMPLEMENT_STATIC_NAME(Score_performer);
 ADD_THIS_PERFORMER(Score_performer);
 
 Score_performer::Score_performer()
 {
-    midi_stream_p_ = 0;
     midi_l_ = 0;
 }
 
 Score_performer::~Score_performer()
 {
-    delete midi_stream_p_;
 }
 
 Translator* 
@@ -47,13 +44,30 @@ Score_performer::depth_i() const
 void
 Score_performer::finish()
 {
+    Performer_group_performer::do_removal_processing();
+
+
+    Midi_stream output_stream( midi_l_->outfile_str_, midi_item_p_arr_.size() + 1, 384 );    
     *mlog << "MIDI output to " << midi_l_->outfile_str_ << " ..." << endl;    
-    *mlog << "tracks: ";
-    header();
-    Performer_group_performer::midi_output( midi_stream_p_ );
+
+    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];
+       
+       if ( it_p->is_type_b( Midi_track::static_name()))
+           ((Midi_track*)it_p )->number_i_ = track_i ++;
+       output_stream<< *it_p;
+    }
     *mlog << endl;
 }
 
+void
+Score_performer::play_event(Midi_item*m)
+{
+    midi_item_p_arr_.push(m);
+}
+
 Moment
 Score_performer::get_mom() const
 {
@@ -61,10 +75,9 @@ Score_performer::get_mom() const
 }
 
 void
-Score_performer::header()
+Score_performer::header(Midi_stream &output_stream)
 {
-    int track_i = 0;
-    Midi_track midi_track( track_i );
+    Midi_track midi_track;
     
     time_t t = time( 0 );
 
@@ -74,38 +87,24 @@ Score_performer::header()
     Midi_text creator( Midi_text::TEXT, str );
     midi_track.add( Moment( 0 ), &creator );
 
-    str = "Generated, at ";
+    str = "Automatically generated at ";
     str += ctime( &t );
     str = str.left_str( str.length_i() - 1 );
-    str += ",\n";
+    str += "\n";
     Midi_text generate( Midi_text::TEXT, str );
     midi_track.add( Moment( 0 ), &generate );
 
     str = "from musical definition: ";
-#if 0    
-    Source_file* sourcefile_l = source_l_g->sourcefile_l( score_l_->defined_ch_C_ );
-    if ( sourcefile_l )
-       str += sourcefile_l->name_str();
-#elif 1
+
     str += score_l_->location_str();
-#else
-    str += score_l_->
-#endif
     Midi_text from( Midi_text::TEXT, str );
     midi_track.add( Moment( 0 ), &from );
 
-    // set track name
-    Midi_text track_name( Midi_text::TRACK_NAME, "Track " + String_convert::i2dec_str( 0, 0, '0' ) );
+    Midi_text track_name( Midi_text::TRACK_NAME, "Track " 
+                         + String_convert::i2dec_str( 0, 0, '0' ) );
     midi_track.add( Moment( 0 ), &track_name );
 
-    // ugh, to please lily when reparsing mi2mu output.
-    // lily currently barfs when no meter present.
-    /* are you sure? init is to 4/4 HWN */
-    Midi_time midi_time( 4, 4, 18 );
-    midi_track.add( Moment( 0.0 ), &midi_time );
-
-    *mlog << "[" << track_i << "]";
-    *midi_stream_p_  << midi_track;
+    output_stream  << midi_track;
 }
 
 void 
@@ -122,12 +121,8 @@ Score_performer::process()
 }
 
 void
-Score_performer::set_score( Score* score_l )
+Score_performer::set_score(Score* score_l )
 {
-    /*
-     why's there no start() when there's a finish()?
-     let's misuse this for start()
-     */
     Global_translator::set_score( score_l );
     midi_l_ = score_l->midi_p_;
 }
@@ -135,12 +130,13 @@ Score_performer::set_score( Score* score_l )
 void
 Score_performer::start()
 {
-    int track_i = 1;
-    Performer_group_performer::set_track( midi_l_, track_i );
-
     if ( midi_l_->outfile_str_ == "" )
        midi_l_->outfile_str_ = default_out_fn + ".midi";
-    
-    midi_stream_p_ = new Midi_stream( midi_l_->outfile_str_, track_i, 384 );
 }
 
+
+int
+Score_performer::get_tempo_i()const
+{
+    return midi_l_->get_tempo_i(Moment( 1, 4 ));
+}