X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscore-performer.cc;h=b44bb489f5b9ccec4b8c46eb97775ac9278eae25;hb=a6a51abfd0195a3cf7d6ea095cf69808852f21ce;hp=9e5db10e88d7c374669423fc2fcac9aebbc11f5c;hpb=a9d9433bc7b95cb2d4b3d96eefce7a8437c0d44e;p=lilypond.git diff --git a/lily/score-performer.cc b/lily/score-performer.cc index 9e5db10e88..b44bb489f5 100644 --- a/lily/score-performer.cc +++ b/lily/score-performer.cc @@ -1,9 +1,20 @@ /* - score-performer.cc -- implement Score_performer + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter + Copyright (C) 1996--2015 Jan Nieuwenhuizen - (c) 1996--2009 Jan Nieuwenhuizen + LilyPond is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + LilyPond is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . */ #include "score-performer.hh" @@ -19,21 +30,20 @@ #include "string-convert.hh" #include "warn.hh" #include "audio-staff.hh" -#include "audio-item.hh" ADD_TRANSLATOR_GROUP (Score_performer, - /* doc */ - "", + /* doc */ + "", - /* create */ - "", + /* create */ + "", - /* read */ - "", + /* read */ + "", - /* write */ - "" - ); + /* write */ + "" + ); Score_performer::Score_performer () { @@ -50,7 +60,7 @@ void Score_performer::announce_element (Audio_element_info info) { announce_infos_.push_back (info); - if (Audio_staff *s = dynamic_cast (info.elem_)) + if (Audio_staff *s = dynamic_cast (info.elem_)) { performance_->audio_staffs_.push_back (s); } @@ -64,75 +74,86 @@ Score_performer::acknowledge_audio_elements () for (vsize i = 0; i < announce_infos_.size (); i++) { if (Audio_item *ai = dynamic_cast (announce_infos_[i].elem_)) - audio_column_->add_audio_item (ai); + audio_column_->add_audio_item (ai); } Performer_group::acknowledge_audio_elements (); } - void Score_performer::connect_to_context (Context *c) { Performer_group::connect_to_context (c); - + Dispatcher *d = c->get_global_context ()->event_source (); - d->add_listener (GET_LISTENER (one_time_step), ly_symbol2scm ("OneTimeStep")); - d->add_listener (GET_LISTENER (prepare), ly_symbol2scm ("Prepare")); - d->add_listener (GET_LISTENER (finish), ly_symbol2scm ("Finish")); + d->add_listener (GET_LISTENER (Score_performer, one_time_step), ly_symbol2scm ("OneTimeStep")); + d->add_listener (GET_LISTENER (Score_performer, prepare), ly_symbol2scm ("Prepare")); + d->add_listener (GET_LISTENER (Score_performer, finish), ly_symbol2scm ("Finish")); } void Score_performer::disconnect_from_context () { Dispatcher *d = context ()->get_global_context ()->event_source (); - d->remove_listener (GET_LISTENER (one_time_step), ly_symbol2scm ("OneTimeStep")); - d->remove_listener (GET_LISTENER (prepare), ly_symbol2scm ("Prepare")); - d->remove_listener (GET_LISTENER (finish), ly_symbol2scm ("Finish")); + d->remove_listener (GET_LISTENER (Score_performer, one_time_step), ly_symbol2scm ("OneTimeStep")); + d->remove_listener (GET_LISTENER (Score_performer, prepare), ly_symbol2scm ("Prepare")); + d->remove_listener (GET_LISTENER (Score_performer, finish), ly_symbol2scm ("Finish")); Performer_group::disconnect_from_context (); } -IMPLEMENT_LISTENER (Score_performer, prepare); void Score_performer::prepare (SCM sev) { - Stream_event *ev = unsmob_stream_event (sev); + Stream_event *ev = unsmob (sev); SCM sm = ev->get_property ("moment"); - Moment *m = unsmob_moment (sm); + Moment *m = unsmob (sm); audio_column_ = new Audio_column (*m); announce_element (Audio_element_info (audio_column_, 0)); precomputed_recurse_over_translators (context (), START_TRANSLATION_TIMESTEP, UP); } -IMPLEMENT_LISTENER (Score_performer, finish); void Score_performer::finish (SCM) { - recurse_over_translators (context (), - &Translator::finalize, - &Translator_group::finalize, - UP); + SCM channel_mapping = context ()->get_property ("midiChannelMapping"); + bool use_ports = scm_is_eq (channel_mapping, ly_symbol2scm ("voice")); + performance_->ports_ = use_ports; + recurse_over_translators + (context (), + Callback0_wrapper::make_smob (), + Callback0_wrapper::make_smob (), + UP); } -IMPLEMENT_LISTENER (Score_performer, one_time_step); void Score_performer::one_time_step (SCM) { + // audio_column_ can be 0 when prepare has not been called. The + // condition is triggered when Simple_music_iterator implicitly + // creates a Score context, like when writing + // + // \score { { | c4 c c c } \midi { } } + // + // The same situation happens with the Score_engraver group, but it + // would appear not to suffer any bad side effects. + + if (!audio_column_) + audio_column_ = new Audio_column (context ()->now_mom ()); if (to_boolean (context ()->get_property ("skipTypesetting"))) { if (!skipping_) { - skip_start_mom_ = audio_column_->when (); - skipping_ = true; + skip_start_mom_ = audio_column_->when (); + skipping_ = true; } } else { if (skipping_) { - offset_mom_ -= audio_column_->when () - skip_start_mom_; - skipping_ = false; - } + offset_mom_ -= audio_column_->when () - skip_start_mom_; + skipping_ = false; + } audio_column_->offset_when (offset_mom_); precomputed_recurse_over_translators (context (), PROCESS_MUSIC, UP); @@ -156,11 +177,8 @@ Score_performer::initialize () { performance_ = new Performance; performance_->unprotect (); - context ()->set_property ("output", performance_->self_scm ()); + context ()->set_property ("output", performance_->self_scm ()); performance_->midi_ = context ()->get_output_def (); - Translator_group::initialize (); } - -