release: 1.3.11

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

diff --git a/lily/time-signature-performer.cc b/lily/time-signature-performer.cc
index df41bf56b00729da02178b7b5cc82387cb5c677a..9a326de1d1f4d91ddf78b8247903834e9c2b672e 100644 (file)
--- a/lily/time-signature-performer.cc
+++ b/lily/time-signature-performer.cc
@@ -1,55 +1,70 @@
 /*
-  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--1999 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "time-signature-performer.hh"
 #include "command-request.hh"
 #include "audio-item.hh"
 
-IMPLEMENT_IS_TYPE_B1(Time_signature_performer,Performer);
-ADD_THIS_TRANSLATOR(Time_signature_performer);
+ADD_THIS_TRANSLATOR (Time_signature_performer);
 
-Time_signature_performer::Time_signature_performer()
+Time_signature_performer::Time_signature_performer ()
 {
   time_signature_req_l_ = 0;
+  audio_p_ = 0;
 }
 
-Time_signature_performer::~Time_signature_performer()
+Time_signature_performer::~Time_signature_performer ()
 {
 }
 
 void 
-Time_signature_performer::do_print() const
+Time_signature_performer::do_print () const
 {
 #ifndef NPRINT
   if (time_signature_req_l_)
-    time_signature_req_l_->print();
+    time_signature_req_l_->print ();
 #endif
 }
 
 void
-Time_signature_performer::do_process_requests()
+Time_signature_performer::do_process_requests ()
 {
   if (time_signature_req_l_)
-    play (new Audio_time_signature (time_signature_req_l_));
-  time_signature_req_l_ = 0;
+    {
+      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_);
+      announce_element (info);
+      time_signature_req_l_ = 0;
+    }
+}
+
+void
+Time_signature_performer::do_pre_move_processing ()
+{
+  if (audio_p_)
+    {
+      play_element (audio_p_);
+      audio_p_ = 0;
+    }
 }
 
 bool
-Time_signature_performer::do_try_request (Request* req_l)
+Time_signature_performer::do_try_music (Music* req_l)
 {
   if (time_signature_req_l_)
     return false;
 
-  if (req_l->access_Command_req ())
-    time_signature_req_l_ = req_l->access_Command_req ()->access_Time_signature_change_req ();
-
-  if (time_signature_req_l_)
-    return true;
+  if (Time_signature_change_req *t =
+      dynamic_cast <Time_signature_change_req *> (req_l))
+    {
+      time_signature_req_l_ = t;
+      return true;
+    }
 
   return false;
 }