Release: bump Welcome versions.

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

diff --git a/lily/key-performer.cc b/lily/key-performer.cc
index 32f94a632ed1356aaa48394432237f901ce9d28c..5de378eda49832c11a8366d155044b23373912ac 100644 (file)
--- a/lily/key-performer.cc
+++ b/lily/key-performer.cc
@@ -1,9 +1,20 @@
 /*
-  key-performer.cc -- implement Key_performer
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2015 Jan Nieuwenhuizen <janneke@gnu.org>
 
-  (c) 1997--2007 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 "audio-item.hh"
@@ -11,6 +22,7 @@
 #include "performer.hh"
 #include "stream-event.hh"
 #include "warn.hh"
+#include "lily-imports.hh"
 
 #include "translator.icc"
 
@@ -24,13 +36,14 @@ protected:
   void process_music ();
   void stop_translation_timestep ();
 
-  DECLARE_TRANSLATOR_LISTENER (key_change);
+  void listen_key_change (Stream_event *);
 private:
   Stream_event *key_ev_;
   Audio_key *audio_;
 };
 
-Key_performer::Key_performer ()
+Key_performer::Key_performer (Context *c)
+  : Performer (c)
 {
   key_ev_ = 0;
   audio_ = 0;
@@ -46,31 +59,30 @@ Key_performer::process_music ()
   if (key_ev_)
     {
       SCM pitchlist = key_ev_->get_property ("pitch-alist");
-      SCM proc = ly_lily_module_constant ("alterations-in-key");
 
-      SCM acc = scm_call_1 (proc, pitchlist);
+      SCM acc = Lily::alterations_in_key (pitchlist);
 
       Pitch key_do (0,
-                   scm_to_int (scm_caar (pitchlist)),
-                   ly_scm2rational (scm_cdar (pitchlist)));
+                    scm_to_int (scm_caar (pitchlist)),
+                    ly_scm2rational (scm_cdar (pitchlist)));
 
-      Pitch c_do (0, 0, 0);
+      Pitch c_do;
 
       SCM c_pitchlist
-       = ly_transpose_key_alist (pitchlist,
-                                 pitch_interval (key_do, c_do).smobbed_copy ());
+        = ly_transpose_key_alist (pitchlist,
+                                  pitch_interval (key_do, c_do).smobbed_copy ());
 
       /* MIDI keys are too limited for lilypond scales.
-        We check for minor scale and assume major otherwise.  */
+         We check for minor scale and assume major otherwise.  */
 
       SCM third = scm_assoc (scm_from_int (2),
-                            c_pitchlist);
+                             c_pitchlist);
       bool minor = (scm_is_pair (third)
-                   && scm_is_number (scm_cdr (third))
-                   && ly_scm2rational (scm_cdr (third)) == FLAT_ALTERATION);
+                    && scm_is_number (scm_cdr (third))
+                    && ly_scm2rational (scm_cdr (third)) == FLAT_ALTERATION);
 
       audio_ = new Audio_key (scm_to_int (acc),
-                             !minor);
+                              !minor);
 
       Audio_element_info info (audio_, key_ev_);
       announce_element (info);
@@ -87,7 +99,6 @@ Key_performer::stop_translation_timestep ()
     }
 }
 
-IMPLEMENT_TRANSLATOR_LISTENER (Key_performer, key_change);
 void
 Key_performer::listen_key_change (Stream_event *ev)
 {
@@ -95,8 +106,22 @@ Key_performer::listen_key_change (Stream_event *ev)
     key_ev_ = ev;
 }
 
+void
+Key_performer::boot ()
+{
+  ADD_LISTENER (Key_performer, key_change);
+}
+
 ADD_TRANSLATOR (Key_performer,
-               "",
-               "",
-               "",
-               "");
+                /* doc */
+                "",
+
+                /* create */
+                "",
+
+                /* read */
+                "",
+
+                /* write */
+                ""
+               );