X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftime-signature-performer.cc;h=f2f3e8f32ac1273231b5ef8b9d2941de884e80c8;hb=cb951038d3e74a85ec8539d0dc51260088251556;hp=9a326de1d1f4d91ddf78b8247903834e9c2b672e;hpb=c89ca5505627d7b52922c4627e4afd02c03e039f;p=lilypond.git

diff --git a/lily/time-signature-performer.cc b/lily/time-signature-performer.cc
index 9a326de1d1..f2f3e8f32a 100644
--- a/lily/time-signature-performer.cc
+++ b/lily/time-signature-performer.cc
@@ -1,71 +1,96 @@
 /*
-  time-signature-performer.cc -- implement Time_signature_performer
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2012 Jan Nieuwenhuizen <janneke@gnu.org>
 
-  (c)  1997--1999 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 "time-signature-performer.hh"
-#include "command-request.hh"
 #include "audio-item.hh"
+#include "performer.hh"
+#include "protected-scm.hh"
 
-ADD_THIS_TRANSLATOR (Time_signature_performer);
+class Time_signature_performer : public Performer
+{
+public:
+  TRANSLATOR_DECLARATIONS (Time_signature_performer);
+  ~Time_signature_performer ();
 
-Time_signature_performer::Time_signature_performer ()
+protected:
+
+  void stop_translation_timestep ();
+  void process_music ();
+  virtual void derived_mark () const;
+  SCM prev_fraction_;
+private:
+
+  Audio_time_signature *audio_;
+};
+
+void
+Time_signature_performer::derived_mark () const
 {
-  time_signature_req_l_ = 0;
-  audio_p_ = 0;
+  scm_gc_mark (prev_fraction_);
 }
 
-Time_signature_performer::~Time_signature_performer ()
+Time_signature_performer::Time_signature_performer ()
 {
+  prev_fraction_ = SCM_BOOL_F;
+  audio_ = 0;
 }
 
-void 
-Time_signature_performer::do_print () const
+Time_signature_performer::~Time_signature_performer ()
 {
-#ifndef NPRINT
-  if (time_signature_req_l_)
-    time_signature_req_l_->print ();
-#endif
 }
 
 void
-Time_signature_performer::do_process_requests ()
+Time_signature_performer::process_music ()
 {
-  if (time_signature_req_l_)
+  SCM fr = get_property ("timeSignatureFraction");
+  if (scm_is_pair (fr) && !ly_is_equal (fr, prev_fraction_))
     {
-      audio_p_ = new Audio_time_signature (time_signature_req_l_->beats_i_, time_signature_req_l_->one_beat_i_);
-      Audio_element_info info (audio_p_, time_signature_req_l_);
+      prev_fraction_ = fr;
+      int b = scm_to_int (scm_car (fr));
+      int o = scm_to_int (scm_cdr (fr));
+
+      audio_ = new Audio_time_signature (b, o);
+      Audio_element_info info (audio_, 0);
       announce_element (info);
-      time_signature_req_l_ = 0;
     }
 }
 
 void
-Time_signature_performer::do_pre_move_processing ()
+Time_signature_performer::stop_translation_timestep ()
 {
-  if (audio_p_)
+  if (audio_)
     {
-      play_element (audio_p_);
-      audio_p_ = 0;
+      audio_ = 0;
     }
 }
 
-bool
-Time_signature_performer::do_try_music (Music* req_l)
-{
-  if (time_signature_req_l_)
-    return false;
+#include "translator.icc"
 
-  if (Time_signature_change_req *t =
-      dynamic_cast <Time_signature_change_req *> (req_l))
-    {
-      time_signature_req_l_ = t;
-      return true;
-    }
+ADD_TRANSLATOR (Time_signature_performer,
+                /* doc */
+                "",
 
-  return false;
-}
+                /* create */
+                "",
+
+                /* read */
+                "",
 
+                /* write */
+                ""
+               );