Run grand replace for 2015.

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

diff --git a/lily/key-performer.cc b/lily/key-performer.cc
index 9c05a1bb4dc3eb20912a7579cc0f835bca3d35ee..fa76c883a47989f98e01c5778c386040ea451125 100644 (file)
--- a/lily/key-performer.cc
+++ b/lily/key-performer.cc
@@ -1,16 +1,30 @@
 /*
-  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--2005 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 "music-sequence.hh"
 #include "audio-item.hh"
+#include "music-sequence.hh"
 #include "performer.hh"
+#include "stream-event.hh"
 #include "warn.hh"
 
+#include "translator.icc"
+
 class Key_performer : public Performer
 {
 public:
@@ -18,12 +32,12 @@ public:
   ~Key_performer ();
 
 protected:
-  virtual bool try_music (Music *ev);
-  virtual void create_audio_elements ();
-  virtual void stop_translation_timestep ();
+  void process_music ();
+  void stop_translation_timestep ();
 
+  DECLARE_TRANSLATOR_LISTENER (key_change);
 private:
-  Event *key_ev_;
+  Stream_event *key_ev_;
   Audio_key *audio_;
 };
 
@@ -38,7 +52,7 @@ Key_performer::~Key_performer ()
 }
 
 void
-Key_performer::create_audio_elements ()
+Key_performer::process_music ()
 {
   if (key_ev_)
     {
@@ -48,20 +62,26 @@ Key_performer::create_audio_elements ()
       SCM acc = scm_call_1 (proc, pitchlist);
 
       Pitch key_do (0,
-                   scm_to_int (scm_caar (pitchlist)),
-                   scm_to_int (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.  */
-      SCM minor = scm_c_eval_string ("minor");
+         We check for minor scale and assume major otherwise.  */
+
+      SCM third = scm_assoc (scm_from_int (2),
+                             c_pitchlist);
+      bool minor = (scm_is_pair (third)
+                    && scm_is_number (scm_cdr (third))
+                    && ly_scm2rational (scm_cdr (third)) == FLAT_ALTERATION);
+
       audio_ = new Audio_key (scm_to_int (acc),
-                             SCM_BOOL_T != scm_equal_p (minor, c_pitchlist));
+                              !minor);
 
       Audio_element_info info (audio_, key_ev_);
       announce_element (info);
@@ -74,27 +94,28 @@ Key_performer::stop_translation_timestep ()
 {
   if (audio_)
     {
-      play_element (audio_);
       audio_ = 0;
     }
 }
 
-bool
-Key_performer::try_music (Music *ev)
+IMPLEMENT_TRANSLATOR_LISTENER (Key_performer, key_change);
+void
+Key_performer::listen_key_change (Stream_event *ev)
 {
-  if (Event *kc = dynamic_cast<Event *> (ev))
-    {
-      if (key_ev_)
-       warning (_ ("FIXME: key change merge"));
-
-      key_ev_ = kc;
-      return true;
-    }
-
-  return false;
+  if (!key_ev_)
+    key_ev_ = ev;
 }
 
 ADD_TRANSLATOR (Key_performer,
-               "", "",
-               "key-change-event",
-               "", "", "");
+                /* doc */
+                "",
+
+                /* create */
+                "",
+
+                /* read */
+                "",
+
+                /* write */
+                ""
+               );