X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftime-signature-performer.cc;h=3d348931a49d02288651aa71445ddd864be00055;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=644055017060c0a99ede69d429a2ad37633f55ef;hpb=9efbad2d9487a05b04423e7e9f062968e8f8eaf4;p=lilypond.git

diff --git a/lily/time-signature-performer.cc b/lily/time-signature-performer.cc
index 6440550170..3d348931a4 100644
--- a/lily/time-signature-performer.cc
+++ b/lily/time-signature-performer.cc
@@ -1,56 +1,85 @@
 /*
-  time_signature-performer.cc -- implement Time_signature_performer
+  time-signature-performer.cc -- implement Time_signature_performer
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1998 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2008 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-#include "time-signature-performer.hh"
-#include "command-request.hh"
 #include "audio-item.hh"
+#include "performer.hh"
+#include "protected-scm.hh"
 
-IMPLEMENT_IS_TYPE_B1(Time_signature_performer,Performer);
-ADD_THIS_TRANSLATOR(Time_signature_performer);
+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:
 
-Time_signature_performer::Time_signature_performer()
+  Audio_time_signature *audio_;
+};
+
+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 (dynamic_cast <Command_req *> (req_l))
-    time_signature_req_l_ = dynamic_cast <Time_signature_change_req *> (req_l);
+#include "translator.icc"
 
-  if (time_signature_req_l_)
-    return true;
+ADD_TRANSLATOR (Time_signature_performer,
+		/* doc */
+		"",
 
-  return false;
-}
+		/* create */
+		"",
+
+		/* read */
+		"",
 
+		/* write */
+		""
+		);