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

diff --git a/lily/score-performer.cc b/lily/score-performer.cc
index 1ab23e096f..4ea42ed143 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
@@ -30,7 +30,6 @@
 #include "string-convert.hh"
 #include "warn.hh"
 #include "audio-staff.hh"
-#include "audio-item.hh"
 
 ADD_TRANSLATOR_GROUP (Score_performer,
                       /* doc */
@@ -86,40 +85,38 @@ 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<Stream_event> (sev);
   SCM sm = ev->get_property ("moment");
-  Moment *m = unsmob_moment (sm);
+  Moment *m = unsmob<Moment> (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)
 {
   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,
@@ -127,7 +124,6 @@ Score_performer::finish (SCM)
                             UP);
 }
 
-IMPLEMENT_LISTENER (Score_performer, one_time_step);
 void
 Score_performer::one_time_step (SCM)
 {