X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscore-performer.cc;h=7546cbd6307eba6ade23b91e93ddebe5a6afddda;hb=8f2f4d6f0af1626a333050d367211a7d73437082;hp=1ab23e096fbe06b8021531b3b40b27353d37e3cb;hpb=5c82851e2bd408a088af4798f17115086372e768;p=lilypond.git

diff --git a/lily/score-performer.cc b/lily/score-performer.cc
index 1ab23e096f..7546cbd630 100644
--- a/lily/score-performer.cc
+++ b/lily/score-performer.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1996--2012 Jan Nieuwenhuizen <janneke@gnu.org>
+  Copyright (C) 1996--2015 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
@@ -106,9 +106,9 @@ 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);
@@ -119,7 +119,7 @@ void
 Score_performer::finish (SCM)
 {
   SCM channel_mapping = context ()->get_property ("midiChannelMapping");
-  bool use_ports = channel_mapping == ly_symbol2scm ("voice");
+  bool use_ports = scm_is_eq (channel_mapping, ly_symbol2scm ("voice"));
   performance_->ports_ = use_ports;
   recurse_over_translators (context (),
                             &Translator::finalize,