X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftime-signature-performer.cc;h=d6226e725a5e7030b07f1f0a091df286f1dacc88;hb=1e1fa5221ca359326b073626168c6b7cda6453e1;hp=95eeacabc02517b8fa06ab4d8592e48b6825f6ec;hpb=78ed9c22a8cbf56ff5390553e0a2854aa42cbbc5;p=lilypond.git

diff --git a/lily/time-signature-performer.cc b/lily/time-signature-performer.cc
index 95eeacabc0..d6226e725a 100644
--- a/lily/time-signature-performer.cc
+++ b/lily/time-signature-performer.cc
@@ -1,71 +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--1999 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2004 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"
+
+
+class Time_signature_performer : public Performer
+{
+public:
+  TRANSLATOR_DECLARATIONS (Time_signature_performer);
+  ~Time_signature_performer ();
+
+protected:
+
+  virtual void stop_translation_timestep ();
+  virtual void create_audio_elements ();
+
+  SCM prev_fraction_;
+private:
+
+  Audio_time_signature* audio_;
+};
 
-ADD_THIS_TRANSLATOR (Time_signature_performer);
 
 Time_signature_performer::Time_signature_performer ()
 {
-  time_signature_req_l_ = 0;
-  audio_p_ = 0;
+  prev_fraction_ = SCM_BOOL_F;
+  audio_ = 0;
 }
 
 Time_signature_performer::~Time_signature_performer ()
 {
 }
 
-void 
-Time_signature_performer::do_print () const
-{
-#ifndef NPRINT
-  if (time_signature_req_l_)
-    time_signature_req_l_->print ();
-#endif
-}
 
 void
-Time_signature_performer::do_process_requests ()
+Time_signature_performer::create_audio_elements ()
 {
-  if (time_signature_req_l_)
+  SCM fr = get_property ("timeSignatureFraction");
+  if (scm_is_pair (fr) && !ly_c_equal_p (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 ()
-{
-  if (audio_p_)
-    {
-      play_element (audio_p_);
-      audio_p_ = 0;
     }
 }
 
-bool
-Time_signature_performer::do_try_music (Music* req_l)
+void
+Time_signature_performer::stop_translation_timestep ()
 {
-  if (time_signature_req_l_)
-    return false;
-
-  if (Time_signature_change_req *t =
-      dynamic_cast <Time_signature_change_req *> (req_l))
+  if (audio_)
     {
-      time_signature_req_l_ = t;
-      return true;
+      play_element (audio_);
+      audio_ = 0;
     }
-
-  return false;
 }
 
+ENTER_DESCRIPTION (Time_signature_performer,"","","","","","");