X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftempo-performer.cc;h=967ae60e7067b7e6b803d85a81479690331f898c;hb=5d84bfad4626892bcffd05adcced53c8a2329047;hp=2e5406bbed34d7ac2e956509692fb54fb30cf5c2;hpb=94a1966c72301b8bd1d8bb3b8628c3f089d007cf;p=lilypond.git

diff --git a/lily/tempo-performer.cc b/lily/tempo-performer.cc
index 2e5406bbed..967ae60e70 100644
--- a/lily/tempo-performer.cc
+++ b/lily/tempo-performer.cc
@@ -1,14 +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--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 "performer.hh"
 
 #include "audio-item.hh"
-#include "performer.hh"
+#include "duration.hh"
+#include "stream-event.hh"
+
+#include "translator.icc"
 
 class Tempo_performer : public Performer
 {
@@ -18,18 +33,24 @@ public:
 
 protected:
 
-  virtual bool try_music (Music* req);
-  virtual void stop_translation_timestep ();
-  virtual void create_audio_elements ();
-
+  virtual void derived_mark () const;
+  void stop_translation_timestep ();
+  void process_music ();
 private:
-Music* tempo_req_;
-  Audio_tempo* audio_;
+  Audio_tempo *audio_;
+  SCM last_tempo_;
 };
 
-Tempo_performer::Tempo_performer ()
+void
+Tempo_performer::derived_mark () const
 {
-  tempo_req_ = 0;
+  scm_gc_mark (last_tempo_);
+}
+
+Tempo_performer::Tempo_performer (Context *c)
+  : Performer (c)
+{
+  last_tempo_ = SCM_EOL;
   audio_ = 0;
 }
 
@@ -37,23 +58,22 @@ Tempo_performer::~Tempo_performer ()
 {
 }
 
-
 void
-Tempo_performer::create_audio_elements ()
+Tempo_performer::process_music ()
 {
-  if (tempo_req_)
+  SCM w = get_property ("tempoWholesPerMinute");
+  if (unsmob<Moment> (w)
+      && !ly_is_equal (w, last_tempo_))
     {
+      Rational r = unsmob<Moment> (w)->main_part_;
+      r *= Rational (4, 1);
 
-      SCM met = tempo_req_->get_property ("metronome-count");
-      Duration *d = unsmob_duration (tempo_req_->get_property ("tempo-unit"));
-      
-      Rational r =  (d->get_length () / Moment (Rational (1, 4)) * Moment (ly_scm2int (met))).main_part_;
-      
-      audio_ = new Audio_tempo (int (r));
+      audio_ = new Audio_tempo (r.to_int ());
 
-      Audio_element_info info (audio_, tempo_req_);
+      Audio_element_info info (audio_, 0);
       announce_element (info);
-      tempo_req_ = 0;
+
+      last_tempo_ = w;
     }
 }
 
@@ -62,24 +82,26 @@ Tempo_performer::stop_translation_timestep ()
 {
   if (audio_)
     {
-      play_element (audio_);
       audio_ = 0;
     }
 }
 
-bool
-Tempo_performer::try_music (Music* req)
+void
+Tempo_performer::boot ()
 {
-  if (tempo_req_)
-    return false;
 
-      tempo_req_ = req;
-      return true;
 }
 
+ADD_TRANSLATOR (Tempo_performer,
+                /* doc */
+                "",
 
+                /* create */
+                "",
 
+                /* read */
+                "tempoWholesPerMinute ",
 
-ENTER_DESCRIPTION (Tempo_performer, "","",
-		   "metronome-change-event",
-		   "","","" );
+                /* write */
+                ""
+               );