X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscore-performer.cc;h=4729fc302e5ffe57daf5c4f1151d54bb363e77db;hb=refs%2Ftags%2Frelease%2F1.1.43;hp=9db18a916f64dbff68816488bb1159eaaca0b78d;hpb=2181534bd94587fcac8f1769f2dda7bece693649;p=lilypond.git diff --git a/lily/score-performer.cc b/lily/score-performer.cc index 9db18a916f..4729fc302e 100644 --- a/lily/score-performer.cc +++ b/lily/score-performer.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1996, 1997 Jan Nieuwenhuizen + (c) 1996, 1997--1999 Jan Nieuwenhuizen */ #include "score-performer.hh" @@ -19,7 +19,7 @@ #include "source.hh" #include "audio-staff.hh" -IMPLEMENT_IS_TYPE_B1(Score_performer,Performer_group_performer); + ADD_THIS_TRANSLATOR(Score_performer); @@ -35,15 +35,11 @@ Score_performer::~Score_performer() void Score_performer::play (Audio_element * p) { - if (p->is_type_b (Audio_item::static_name())) - { - audio_column_l_->add ((Audio_item*)p); - } - else if (p->is_type_b (Audio_staff::static_name())) + if (Audio_item * i=dynamic_cast (p)) { - performance_p_->add_staff ((Audio_staff*)p); + audio_column_l_->add_audio_item (i); } - performance_p_->add (p); + performance_p_->add_element (p); } void @@ -51,7 +47,7 @@ Score_performer::prepare (Moment m) { Global_translator::prepare (m); audio_column_l_ = new Audio_column (m); - performance_p_->add (audio_column_l_); + play (audio_column_l_); post_move_processing (); } @@ -95,7 +91,7 @@ void Score_performer::do_add_processing () { Translator_group::do_add_processing (); - assert (output_def_l_->is_type_b (Midi_def::static_name ())); + assert (dynamic_cast (output_def_l_)); performance_p_ = new Performance; - performance_p_->midi_l_ = (Midi_def*) output_def_l_; + performance_p_->midi_l_ = dynamic_cast(output_def_l_); }