Merge branch 'master' of /home/jcharles/GIT/Lily/. into translation

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

diff --git a/lily/dynamic-performer.cc b/lily/dynamic-performer.cc
index 411fbd2f0ad04ebf27dbee70d56b5018c7c66c62..46a8a446d35af8c3a32e949c34f59ed962e520c1 100644 (file)
--- a/lily/dynamic-performer.cc
+++ b/lily/dynamic-performer.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2000--2014 Jan Nieuwenhuizen <janneke@gnu.org>
+  Copyright (C) 2000--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
@@ -33,9 +33,9 @@ protected:
   void process_music ();
   Real equalize_volume (Real);
 
-  DECLARE_TRANSLATOR_LISTENER (decrescendo);
-  DECLARE_TRANSLATOR_LISTENER (crescendo);
-  DECLARE_TRANSLATOR_LISTENER (absolute_dynamic);
+  void listen_decrescendo (Stream_event *);
+  void listen_crescendo (Stream_event *);
+  void listen_absolute_dynamic (Stream_event *);
 private:
   Stream_event *script_event_;
   Drul_array<Stream_event *> span_events_;
@@ -87,7 +87,7 @@ Dynamic_performer::equalize_volume (Real volume)
         s = get_property ("instrumentName");
 
       if (!scm_is_string (s))
-        s = scm_from_locale_string ("piano");
+        s = scm_from_ascii_string ("piano");
 
       SCM eq = get_property ("instrumentEqualizer");
       if (ly_is_procedure (eq))
@@ -206,7 +206,6 @@ Dynamic_performer::stop_translation_timestep ()
     = span_events_[RIGHT] = 0;
 }
 
-IMPLEMENT_TRANSLATOR_LISTENER (Dynamic_performer, decrescendo);
 void
 Dynamic_performer::listen_decrescendo (Stream_event *r)
 {
@@ -215,7 +214,6 @@ Dynamic_performer::listen_decrescendo (Stream_event *r)
   grow_dir_[d] = SMALLER;
 }
 
-IMPLEMENT_TRANSLATOR_LISTENER (Dynamic_performer, crescendo);
 void
 Dynamic_performer::listen_crescendo (Stream_event *r)
 {
@@ -224,7 +222,6 @@ Dynamic_performer::listen_crescendo (Stream_event *r)
   grow_dir_[d] = BIGGER;
 }
 
-IMPLEMENT_TRANSLATOR_LISTENER (Dynamic_performer, absolute_dynamic);
 void
 Dynamic_performer::listen_absolute_dynamic (Stream_event *r)
 {
@@ -232,6 +229,14 @@ Dynamic_performer::listen_absolute_dynamic (Stream_event *r)
     script_event_ = r;
 }
 
+void
+Dynamic_performer::boot ()
+{
+  ADD_LISTENER (Dynamic_performer, decrescendo);
+  ADD_LISTENER (Dynamic_performer, crescendo);
+  ADD_LISTENER (Dynamic_performer, absolute_dynamic);
+}
+
 ADD_TRANSLATOR (Dynamic_performer,
                 /* doc */
                 "",