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

diff --git a/lily/tempo-performer.cc b/lily/tempo-performer.cc
index 53ca7c056c..f69166e9c5 100644
--- a/lily/tempo-performer.cc
+++ b/lily/tempo-performer.cc
@@ -1,89 +1,100 @@
 /*
-  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--2001 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 "command-request.hh"
-#include "audio-item.hh"
 #include "performer.hh"
 
+#include "audio-item.hh"
+#include "duration.hh"
+#include "stream-event.hh"
+
+#include "translator.icc"
+
 class Tempo_performer : public Performer
 {
 public:
-  VIRTUAL_COPY_CONS (Translator);
-  
-  Tempo_performer ();
+  TRANSLATOR_DECLARATIONS (Tempo_performer);
   ~Tempo_performer ();
 
 protected:
 
-  virtual bool try_music (Music* req_l);
-  virtual void stop_translation_timestep ();
-  virtual void create_audio_elements ();
-
+  virtual void derived_mark () const;
+  void stop_translation_timestep ();
+  void process_music ();
 private:
-  Tempo_req* tempo_req_l_;
-  Audio_tempo* audio_p_;
+  Audio_tempo *audio_;
+  SCM last_tempo_;
 };
 
-ADD_THIS_TRANSLATOR (Tempo_performer);
+void
+Tempo_performer::derived_mark () const
+{
+  scm_gc_mark (last_tempo_);
+}
 
 Tempo_performer::Tempo_performer ()
 {
-  tempo_req_l_ = 0;
-  audio_p_ = 0;
+  last_tempo_ = SCM_EOL;
+  audio_ = 0;
 }
 
 Tempo_performer::~Tempo_performer ()
 {
 }
 
-
 void
-Tempo_performer::create_audio_elements ()
+Tempo_performer::process_music ()
 {
-  if (tempo_req_l_)
+  SCM w = get_property ("tempoWholesPerMinute");
+  if (Moment::is_smob (w)
+      && !ly_is_equal (w, last_tempo_))
     {
+      Rational r = Moment::unsmob (w)->main_part_;
+      r *= Rational (4, 1);
 
-      SCM met = tempo_req_l_->get_mus_property ("metronome-count");
-      Duration *d = unsmob_duration (tempo_req_l_->get_mus_property ("duration"));
-      
-      audio_p_ = new Audio_tempo (d->length_mom () /
-				  Moment (1, 4) 
-				  * Moment (gh_scm2int (met)));
+      audio_ = new Audio_tempo (r.to_int ());
 
-      Audio_element_info info (audio_p_, tempo_req_l_);
+      Audio_element_info info (audio_, 0);
       announce_element (info);
-      tempo_req_l_ = 0;
+
+      last_tempo_ = w;
     }
 }
 
 void
 Tempo_performer::stop_translation_timestep ()
 {
-  if (audio_p_)
+  if (audio_)
     {
-      play_element (audio_p_);
-      audio_p_ = 0;
+      audio_ = 0;
     }
 }
 
-bool
-Tempo_performer::try_music (Music* req_l)
-{
-  if (tempo_req_l_)
-    return false;
+ADD_TRANSLATOR (Tempo_performer,
+                /* doc */
+                "",
 
-  if (Tempo_req *t =
-      dynamic_cast <Tempo_req *> (req_l))
-    {
-      tempo_req_l_ = t;
-      return true;
-    }
+                /* create */
+                "",
 
-  return false;
-}
+                /* read */
+                "tempoWholesPerMinute ",
 
+                /* write */
+                ""
+               );