X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fkey-performer.cc;h=fa76c883a47989f98e01c5778c386040ea451125;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=ce8c330ad35ff326100f65678b338a64e231d1c4;hpb=1b9fc29140bd1d9345f784595afd22158876dfb7;p=lilypond.git

diff --git a/lily/key-performer.cc b/lily/key-performer.cc
index ce8c330ad3..fa76c883a4 100644
--- a/lily/key-performer.cc
+++ b/lily/key-performer.cc
@@ -1,37 +1,49 @@
 /*
-  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--2002 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.
 
-#include "lily-guile.hh"
+  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"
+#include "music-sequence.hh"
 #include "performer.hh"
+#include "stream-event.hh"
 #include "warn.hh"
 
+#include "translator.icc"
 
 class Key_performer : public Performer
 {
 public:
-  TRANSLATOR_DECLARATIONS(Key_performer);
+  TRANSLATOR_DECLARATIONS (Key_performer);
   ~Key_performer ();
 
 protected:
-  virtual bool try_music (Music* req);
-  virtual void create_audio_elements ();
-  virtual void stop_translation_timestep ();
+  void process_music ();
+  void stop_translation_timestep ();
 
+  DECLARE_TRANSLATOR_LISTENER (key_change);
 private:
-  Key_change_req* key_req_;
-  Audio_key* audio_;
+  Stream_event *key_ev_;
+  Audio_key *audio_;
 };
 
 Key_performer::Key_performer ()
 {
-  key_req_ = 0;
+  key_ev_ = 0;
   audio_ = 0;
 }
 
@@ -40,37 +52,40 @@ Key_performer::~Key_performer ()
 }
 
 void
-Key_performer::create_audio_elements ()
+Key_performer::process_music ()
 {
-  if (key_req_) 
+  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);
+
+      Pitch key_do (0,
+                    scm_to_int (scm_caar (pitchlist)),
+                    ly_scm2rational (scm_cdar (pitchlist)));
+
+      Pitch c_do;
+
+      SCM c_pitchlist
+        = 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.  */
 
-      /*
-	UGH. primitive-eval.
-       */
-      SCM pitchlist = key_req_->get_mus_property ("pitch-alist");
-      SCM proc = scm_primitive_eval (ly_symbol2scm ("accidentals-in-key")); 
-      SCM acc = gh_call1 (proc, pitchlist);
-      proc = scm_primitive_eval (ly_symbol2scm ("major-key"));
- 
-      Pitch my_do (0, 
-		   gh_scm2int (ly_caar (pitchlist)),
-		   gh_scm2int (ly_cdar (pitchlist)));
-		  
-      Pitch to_c (-1,
-		   (7 - gh_scm2int (ly_caar (pitchlist))) % 7,
-		   -gh_scm2int (ly_cdar (pitchlist)));
-
-      my_do.transpose (to_c);
-      to_c.alteration_ -= my_do.alteration_;
-
-      SCM c_pitchlist = transpose_key_alist (pitchlist, to_c.smobbed_copy());
-      SCM major = gh_call1 (proc, c_pitchlist);
-
-      audio_ = new Audio_key (gh_scm2int (acc), major == SCM_BOOL_T); 
-      Audio_element_info info (audio_, key_req_);
+      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),
+                              !minor);
+
+      Audio_element_info info (audio_, key_ev_);
       announce_element (info);
-      key_req_ = 0;
+      key_ev_ = 0;
     }
 }
 
@@ -79,27 +94,28 @@ Key_performer::stop_translation_timestep ()
 {
   if (audio_)
     {
-      play_element (audio_);
       audio_ = 0;
     }
 }
 
-bool
-Key_performer::try_music (Music* req)
+IMPLEMENT_TRANSLATOR_LISTENER (Key_performer, key_change);
+void
+Key_performer::listen_key_change (Stream_event *ev)
 {
-  if (Key_change_req *kc = dynamic_cast <Key_change_req *> (req))
-    {
-      if (key_req_)
-	warning (_ ("FIXME: key change merge"));
+  if (!key_ev_)
+    key_ev_ = ev;
+}
 
-      key_req_ = kc;
-      return true;
-    }
+ADD_TRANSLATOR (Key_performer,
+                /* doc */
+                "",
 
-  return false;
-}
+                /* create */
+                "",
+
+                /* read */
+                "",
 
-ENTER_DESCRIPTION(Key_performer,
-		  "","",
-		  "key-change-event",
-		  "","","");
+                /* write */
+                ""
+               );