patch::: 1.3.108.jcn5

[lilypond.git] / lily / time-signature-performer.cc

diff --git a/lily/time-signature-performer.cc b/lily/time-signature-performer.cc
index 4efa775cf8fc1460c34654cee3cf312af9988339..c544be81804c59489ce6f70987fcc7f7c72032c6 100644 (file)
--- a/lily/time-signature-performer.cc
+++ b/lily/time-signature-performer.cc
@@ -1,56 +1,72 @@
 /*
-  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--2000 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-#include "time-signature-performer.hh"
-#include "command-request.hh"
 #include "audio-item.hh"
+#include "lily-proto.hh"
+#include "performer.hh"
 
 
-ADD_THIS_TRANSLATOR(Time_signature_performer);
-
-Time_signature_performer::Time_signature_performer()
+class Time_signature_performer : public Performer
 {
-  time_signature_req_l_ = 0;
-}
+public:
+  VIRTUAL_COPY_CONS(Translator);
+  
+  Time_signature_performer();
+  ~Time_signature_performer();
+
+protected:
+
+  virtual void do_pre_move_processing ();
+  virtual void process_acknowledged ();
+
+  SCM prev_fraction_;
+private:
+  Time_signature_change_req* time_signature_req_l_;
+  Audio_time_signature* audio_p_;
+};
+
 
-Time_signature_performer::~Time_signature_performer()
+Time_signature_performer::Time_signature_performer ()
 {
+  prev_fraction_ = SCM_BOOL_F;
+  audio_p_ = 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_acknowledged ()
 {
-  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 (gh_pair_p (fr)
+      && scm_equal_p (fr, prev_fraction_) != SCM_BOOL_T)
+    {
+      int b = gh_scm2int (gh_car (fr));
+      int o = gh_scm2int (gh_cdr (fr));
+      
+      audio_p_ = new Audio_time_signature (b,o);
+      Audio_element_info info (audio_p_, 0);
+      announce_element (info);
+      time_signature_req_l_ = 0;
+    }
 }
 
-bool
-Time_signature_performer::do_try_music (Music* req_l)
+void
+Time_signature_performer::do_pre_move_processing ()
 {
-  if (time_signature_req_l_)
-    return false;
-
-  if (dynamic_cast <Command_req *> (req_l))
-    time_signature_req_l_ = dynamic_cast <Time_signature_change_req *> (req_l);
-
-  if (time_signature_req_l_)
-    return true;
-
-  return false;
+  if (audio_p_)
+    {
+      play_element (audio_p_);
+      audio_p_ = 0;
+    }
 }
+ADD_THIS_TRANSLATOR (Time_signature_performer);