X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftime-signature-performer.cc;h=d9c25554fd7c637e8ecdd793047de78b1c81a6d1;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=df41bf56b00729da02178b7b5cc82387cb5c677a;hpb=1e95a0be01466d1c98644f7705c8e07e41cc645c;p=lilypond.git

diff --git a/lily/time-signature-performer.cc b/lily/time-signature-performer.cc
index df41bf56b0..d9c25554fd 100644
--- a/lily/time-signature-performer.cc
+++ b/lily/time-signature-performer.cc
@@ -1,56 +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--2015 Jan Nieuwenhuizen <janneke@gnu.org>
 
-  (c)  1997--1998 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"
+
+class Time_signature_performer : public Performer
+{
+public:
+  TRANSLATOR_DECLARATIONS (Time_signature_performer);
+  ~Time_signature_performer ();
+
+protected:
+
+  void stop_translation_timestep ();
+  void process_music ();
+  virtual void derived_mark () const;
+  SCM prev_fraction_;
+private:
 
-IMPLEMENT_IS_TYPE_B1(Time_signature_performer,Performer);
-ADD_THIS_TRANSLATOR(Time_signature_performer);
+  Audio_time_signature *audio_;
+};
 
-Time_signature_performer::Time_signature_performer()
+void
+Time_signature_performer::derived_mark () const
 {
-  time_signature_req_l_ = 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_)
-    play (new Audio_time_signature (time_signature_req_l_));
-  time_signature_req_l_ = 0;
+  SCM fr = get_property ("timeSignatureFraction");
+  if (scm_is_pair (fr) && !ly_is_equal (fr, prev_fraction_))
+    {
+      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);
+    }
 }
 
-bool
-Time_signature_performer::do_try_request (Request* req_l)
+void
+Time_signature_performer::stop_translation_timestep ()
 {
-  if (time_signature_req_l_)
-    return false;
+  if (audio_)
+    {
+      audio_ = 0;
+    }
+}
 
-  if (req_l->access_Command_req ())
-    time_signature_req_l_ = req_l->access_Command_req ()->access_Time_signature_change_req ();
+#include "translator.icc"
 
-  if (time_signature_req_l_)
-    return true;
+ADD_TRANSLATOR (Time_signature_performer,
+                /* doc */
+                "",
 
-  return false;
-}
+                /* create */
+                "",
+
+                /* read */
+                "",
 
+                /* write */
+                ""
+               );