release: 1.1.1

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

diff --git a/lily/score-performer.cc b/lily/score-performer.cc
index bb05c0f16a88ac815f1b550c1be64e4294639ecc..48822afc4c3dbdbb627cc8e91aa931d67106a05b 100644 (file)
--- a/lily/score-performer.cc
+++ b/lily/score-performer.cc
@@ -2,165 +2,100 @@
   score-performer.cc -- implement Score_performer
 
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1996, 1997 Jan Nieuwenhuizen <jan@digicash.com>
+
+  (c) 1996,  1997--1998 Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
-#include <time.h>
 #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 "audio-item.hh"
+#include "performance.hh"
 #include "midi-stream.hh"
 #include "string-convert.hh"
 #include "debug.hh"
-#include "main.hh"
 #include "score.hh"
 #include "source-file.hh"
 #include "source.hh"
+#include "audio-staff.hh"
 
 IMPLEMENT_IS_TYPE_B1(Score_performer,Performer_group_performer);
-ADD_THIS_PERFORMER(Score_performer);
+ADD_THIS_TRANSLATOR(Score_performer);
+
 
 Score_performer::Score_performer()
 {
-    midi_l_ = 0;
 }
 
+
 Score_performer::~Score_performer()
 {
 }
 
-Translator* 
-Score_performer::ancestor_l( int l ) 
-{ 
-    return Global_translator::ancestor_l( l );
-}
-
-int 
-Score_performer::depth_i() const 
-{ 
-    return Global_translator::depth_i();
-}
-
 void
-Score_performer::finish()
+Score_performer::play (Audio_element * p)
 {
-    Performer_group_performer::do_removal_processing();
-
-
-    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_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 ++;
-       output_stream<< *it_p;
+  if  (dynamic_cast<Audio_item *> (p)) 
+    {
+      audio_column_l_->add_audio_item ((Audio_item*)p);
+    }
+  else if (dynamic_cast<Audio_staff *> (p)) 
+    {
+      performance_p_->add_staff ((Audio_staff*)p);
     }
-    *output_stream.os_p_ << flush;
-    *mlog << endl;
+  performance_p_->add_element (p);
 }
 
-void
-Score_performer::play( Audio_item* l )
+void 
+Score_performer::prepare (Moment m)
 {
-    l->audio_column_l_ = audio_column_l_;
-    audio_column_l_->add( l );
+  Global_translator::prepare (m);
+  audio_column_l_ = new Audio_column (m);
+  performance_p_->add_column (audio_column_l_);
+  post_move_processing ();
 }
 
-void
-Score_performer::play( Midi_item* l )
-{
-    midi_item_l_arr_.push( l );
-}
 
-Moment
-Score_performer::get_mom() const
+void 
+Score_performer::process()
 {
-    return now_mom_;
+  process_requests();
+  pre_move_processing();
+  check_removal();
 }
 
 void
-Score_performer::header(Midi_stream &output_stream)
+Score_performer::start()
 {
-    Midi_track midi_track;
-    
-    time_t t = time( 0 );
-
-    // perhaps multiple text events?
-    String str = String( "Creator: " ) + get_version_str() + "\n";
-
-    Midi_text creator( Midi_text::TEXT, str );
-    midi_track.add( Moment( 0 ), &creator );
-
-    str = "Automatically generated at ";
-    str += ctime( &t );
-    str = str.left_str( str.length_i() - 1 );
-    str += "\n";
-    Midi_text generate( Midi_text::TEXT, str );
-    midi_track.add( Moment( 0 ), &generate );
-
-    str = "from musical definition: ";
-
-    str += score_l_->location_str();
-    Midi_text from( Midi_text::TEXT, str );
-    midi_track.add( Moment( 0 ), &from );
-
-    Midi_text track_name( Midi_text::TRACK_NAME, "Track " 
-                         + 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;
 }
 
-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 
-Score_performer::process()
+int
+Score_performer::get_tempo_i() const
 {
-    process_requests();
-    prev_mom_ = now_mom_;
+  return performance_p_->midi_l_->get_tempo_i (Moment (1, 4));
 }
 
 void
-Score_performer::set_score(Score* score_l )
+Score_performer::finish()
 {
-    Global_translator::set_score( score_l );
-    midi_l_ = score_l->midi_p_;
+  check_removal ();
+  removal_processing();
 }
 
-void
-Score_performer::start()
+Music_output *
+Score_performer::get_output_p ()
 {
-    //<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";
+  Music_output * o = performance_p_;
+  performance_p_ =0;
+  return o;
 }
 
-
-int
-Score_performer::get_tempo_i()const
+void
+Score_performer::do_add_processing ()
 {
-    return midi_l_->get_tempo_i(Moment( 1, 4 ));
+  Translator_group::do_add_processing ();
+  assert (dynamic_cast<Midi_def *> (output_def_l_));
+  performance_p_ = new Performance;
+  performance_p_->midi_l_ = (Midi_def*) output_def_l_;  
 }