X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftempo-performer.cc;h=967ae60e7067b7e6b803d85a81479690331f898c;hb=90e4d7057f3857da049dfda3d130017d4719bd6b;hp=9a70f9cdc4d78a4ceec4a45d1249b76587e03656;hpb=9f3572d98bb948c9689cd1f75401a029451fa001;p=lilypond.git

diff --git a/lily/tempo-performer.cc b/lily/tempo-performer.cc
index 9a70f9cdc4..967ae60e70 100644
--- a/lily/tempo-performer.cc
+++ b/lily/tempo-performer.cc
@@ -1,16 +1,29 @@
 /*
-  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"
 
 #include "audio-item.hh"
-#include "music.hh"
 #include "duration.hh"
+#include "stream-event.hh"
+
+#include "translator.icc"
 
 class Tempo_performer : public Performer
 {
@@ -20,18 +33,24 @@ public:
 
 protected:
 
-  virtual bool try_music (Music *event);
+  virtual void derived_mark () const;
   void stop_translation_timestep ();
   void process_music ();
-
 private:
-  Music *tempo_event_;
   Audio_tempo *audio_;
+  SCM last_tempo_;
 };
 
-Tempo_performer::Tempo_performer ()
+void
+Tempo_performer::derived_mark () const
 {
-  tempo_event_ = 0;
+  scm_gc_mark (last_tempo_);
+}
+
+Tempo_performer::Tempo_performer (Context *c)
+  : Performer (c)
+{
+  last_tempo_ = SCM_EOL;
   audio_ = 0;
 }
 
@@ -42,18 +61,19 @@ Tempo_performer::~Tempo_performer ()
 void
 Tempo_performer::process_music ()
 {
-  if (tempo_event_)
+  SCM w = get_property ("tempoWholesPerMinute");
+  if (unsmob<Moment> (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 = unsmob<Moment> (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;
     }
 }
 
@@ -62,23 +82,26 @@ Tempo_performer::stop_translation_timestep ()
 {
   if (audio_)
     {
-      play_element (audio_);
       audio_ = 0;
     }
 }
 
-bool
-Tempo_performer::try_music (Music *event)
+void
+Tempo_performer::boot ()
 {
-  if (tempo_event_)
-    return false;
 
-  tempo_event_ = event;
-  return true;
 }
 
-#include "translator.icc"
+ADD_TRANSLATOR (Tempo_performer,
+                /* doc */
+                "",
+
+                /* create */
+                "",
+
+                /* read */
+                "tempoWholesPerMinute ",
 
-ADD_TRANSLATOR (Tempo_performer, "", "",
-		"metronome-change-event",
-		"", "");
+                /* write */
+                ""
+               );