X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fkey-performer.cc;h=219454115a04dc673f2ce903d04d2be68afded22;hb=f80e0f5e69fa8ffb35b6d3b7d162ed4191586c0c;hp=8d00b911cd026e0f93c6ef56df4d0ce0b63be789;hpb=14d74ac262744d16fc753ee41042d32860d58633;p=lilypond.git

diff --git a/lily/key-performer.cc b/lily/key-performer.cc
index 8d00b911cd..219454115a 100644
--- a/lily/key-performer.cc
+++ b/lily/key-performer.cc
@@ -1,14 +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--2004 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"
+#include "music-sequence.hh"
 #include "performer.hh"
+#include "stream-event.hh"
 #include "warn.hh"
+#include "lily-imports.hh"
+
+#include "translator.icc"
 
 class Key_performer : public Performer
 {
@@ -17,18 +33,18 @@ public:
   ~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 ();
 
+  void listen_key_change (Stream_event *);
 private:
-  Key_change_ev* key_req_;
-  Audio_key* audio_;
+  Stream_event *key_ev_;
+  Audio_key *audio_;
 };
 
 Key_performer::Key_performer ()
 {
-  key_req_ = 0;
+  key_ev_ = 0;
   audio_ = 0;
 }
 
@@ -37,34 +53,39 @@ Key_performer::~Key_performer ()
 }
 
 void
-Key_performer::create_audio_elements ()
+Key_performer::process_music ()
 {
-  if (key_req_) 
+  if (key_ev_)
     {
-      SCM pitchlist = key_req_->get_property ("pitch-alist");
-      SCM proc = ly_scheme_function ("alterations-in-key");
-      
-      SCM acc = scm_call_1 (proc, pitchlist);
-      
-      Pitch key_do (0, 
-		    scm_to_int (scm_caar (pitchlist)),
-		    scm_to_int (scm_cdar (pitchlist)));
-
-      Pitch c_do (0, 0, 0);
-		  
+      SCM pitchlist = key_ev_->get_property ("pitch-alist");
+
+      SCM acc = Lily::alterations_in_key (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 ());
+        = 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_req_);
+      Audio_element_info info (audio_, key_ev_);
       announce_element (info);
-      key_req_ = 0;
+      key_ev_ = 0;
     }
 }
 
@@ -73,27 +94,33 @@ Key_performer::stop_translation_timestep ()
 {
   if (audio_)
     {
-      play_element (audio_);
       audio_ = 0;
     }
 }
 
-bool
-Key_performer::try_music (Music* req)
+void
+Key_performer::listen_key_change (Stream_event *ev)
 {
-  if (Key_change_ev *kc = dynamic_cast <Key_change_ev *> (req))
-    {
-      if (key_req_)
-	warning (_ ("FIXME: key change merge"));
-
-      key_req_ = kc;
-      return true;
-    }
+  if (!key_ev_)
+    key_ev_ = ev;
+}
 
-  return false;
+void
+Key_performer::boot ()
+{
+  ADD_LISTENER (Key_performer, key_change);
 }
 
 ADD_TRANSLATOR (Key_performer,
-		  "","",
-		  "key-change-event",
-		  "","","");
+                /* doc */
+                "",
+
+                /* create */
+                "",
+
+                /* read */
+                "",
+
+                /* write */
+                ""
+               );