resolve merge

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

diff --git a/lily/score-performer.cc b/lily/score-performer.cc
index 9e5db10e88d7c374669423fc2fcac9aebbc11f5c..5257788df6b7969ad07ec12925bf5ea0beab0695 100644 (file)
--- 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--2011 Jan Nieuwenhuizen <janneke@gnu.org>
 
-  (c) 1996--2009 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"
@@ -108,6 +119,9 @@ 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,