X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscore-performer.cc;h=9c3b82267d882e1437168079c36969796bca0348;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=73f79add862ba55bdd66b589d80eede1d5238532;hpb=9e69cb84d6ee5b0a861cd97869b10e3bdf0c833c;p=lilypond.git

diff --git a/lily/score-performer.cc b/lily/score-performer.cc
index 73f79add86..9c3b82267d 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 <janneke@gnu.org>
 
-  (c) 1996--2006 Jan Nieuwenhuizen <janneke@gnu.org>
+  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 <http://www.gnu.org/licenses/>.
 */
 
 #include "score-performer.hh"
@@ -22,10 +33,18 @@
 #include "audio-item.hh"
 
 ADD_TRANSLATOR_GROUP (Score_performer,
-		      /* doc */ "",
-		      /* create */ "",
-		      /* read */ "",
-		      /* write */ "");
+                      /* doc */
+                      "",
+
+                      /* create */
+                      "",
+
+                      /* read */
+                      "",
+
+                      /* write */
+                      ""
+                     );
 
 Score_performer::Score_performer ()
 {
@@ -42,7 +61,7 @@ void
 Score_performer::announce_element (Audio_element_info info)
 {
   announce_infos_.push_back (info);
-  if (Audio_staff *s = dynamic_cast<Audio_staff*> (info.elem_))
+  if (Audio_staff *s = dynamic_cast<Audio_staff *> (info.elem_))
     {
       performance_->audio_staffs_.push_back (s);
     }
@@ -56,17 +75,16 @@ Score_performer::acknowledge_audio_elements ()
   for (vsize i = 0; i < announce_infos_.size (); i++)
     {
       if (Audio_item *ai = dynamic_cast<Audio_item *> (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"));
@@ -88,10 +106,11 @@ IMPLEMENT_LISTENER (Score_performer, prepare);
 void
 Score_performer::prepare (SCM sev)
 {
-  Stream_event *ev = unsmob_stream_event (sev);
+  Stream_event *ev = Stream_event::unsmob (sev);
   SCM sm = ev->get_property ("moment");
-  Moment *m = unsmob_moment (sm);
+  Moment *m = Moment::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);
 }
 
@@ -99,33 +118,47 @@ IMPLEMENT_LISTENER (Score_performer, finish);
 void
 Score_performer::finish (SCM)
 {
+  SCM channel_mapping = context ()->get_property ("midiChannelMapping");
+  bool use_ports = channel_mapping == ly_symbol2scm ("voice");
+  performance_->ports_ = use_ports;
   recurse_over_translators (context (),
-			    &Translator::finalize,
-			    &Translator_group::finalize,
-			    UP);
+                            &Translator::finalize,
+                            &Translator_group::finalize,
+                            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_->at_mom ();
-	  skipping_ = true;
+          skip_start_mom_ = audio_column_->when ();
+          skipping_ = true;
         }
     }
   else
     {
       if (skipping_)
         {
-	  offset_mom_ -= audio_column_->at_mom () - skip_start_mom_;
-	  skipping_ = false;
-	}
+          offset_mom_ -= audio_column_->when () - skip_start_mom_;
+          skipping_ = false;
+        }
 
-      audio_column_->offset_at_mom (offset_mom_);
+      audio_column_->offset_when (offset_mom_);
       precomputed_recurse_over_translators (context (), PROCESS_MUSIC, UP);
       do_announces ();
     }
@@ -147,11 +180,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 ();
 }
-
-