X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftempo-performer.cc;h=f69166e9c51987fb24d0dbfae7ad384d33d77661;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=e21f617b60f94a5e27e48152452a5a5fdafebae3;hpb=b6a8afbd0a9a0b36b07c114503d81a7c420e09e7;p=lilypond.git

diff --git a/lily/tempo-performer.cc b/lily/tempo-performer.cc
index e21f617b60..f69166e9c5 100644
--- a/lily/tempo-performer.cc
+++ b/lily/tempo-performer.cc
@@ -1,9 +1,20 @@
 /*
-  tempo-performer.cc -- implement Tempo_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--2006 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 "performer.hh"
@@ -22,17 +33,23 @@ public:
 
 protected:
 
+  virtual void derived_mark () const;
   void stop_translation_timestep ();
   void process_music ();
-  DECLARE_TRANSLATOR_LISTENER (metronome_change);
 private:
-  Stream_event *tempo_event_;
   Audio_tempo *audio_;
+  SCM last_tempo_;
 };
 
+void
+Tempo_performer::derived_mark () const
+{
+  scm_gc_mark (last_tempo_);
+}
+
 Tempo_performer::Tempo_performer ()
 {
-  tempo_event_ = 0;
+  last_tempo_ = SCM_EOL;
   audio_ = 0;
 }
 
@@ -43,18 +60,19 @@ Tempo_performer::~Tempo_performer ()
 void
 Tempo_performer::process_music ()
 {
-  if (tempo_event_)
+  SCM w = get_property ("tempoWholesPerMinute");
+  if (Moment::is_smob (w)
+      && !ly_is_equal (w, last_tempo_))
     {
-      SCM met = tempo_event_->get_property ("metronome-count");
-      Duration *d = unsmob_duration (tempo_event_->get_property ("tempo-unit"));
-
-      Rational r = (d->get_length () / Moment (Rational (1, 4)) * Moment (scm_to_int (met))).main_part_;
+      Rational r = Moment::unsmob (w)->main_part_;
+      r *= Rational (4, 1);
 
       audio_ = new Audio_tempo (r.to_int ());
 
-      Audio_element_info info (audio_, tempo_event_);
+      Audio_element_info info (audio_, 0);
       announce_element (info);
-      tempo_event_ = 0;
+
+      last_tempo_ = w;
     }
 }
 
@@ -63,18 +81,20 @@ Tempo_performer::stop_translation_timestep ()
 {
   if (audio_)
     {
-      play_element (audio_);
       audio_ = 0;
     }
 }
 
-IMPLEMENT_TRANSLATOR_LISTENER (Tempo_performer, metronome_change);
-void
-Tempo_performer::listen_metronome_change (Stream_event *event)
-{
-  tempo_event_ = event;
-}
+ADD_TRANSLATOR (Tempo_performer,
+                /* doc */
+                "",
+
+                /* create */
+                "",
+
+                /* read */
+                "tempoWholesPerMinute ",
 
-ADD_TRANSLATOR (Tempo_performer, "", "",
-		"metronome-change-event",
-		"", "");
+                /* write */
+                ""
+               );