X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftime-signature-performer.cc;h=30627f2b3c5230772f128b6b33b3a49bfeb0d194;hb=dcf803f51a8621e64670930f89e9e02d845fe598;hp=4c2076fd00fd9c4273338c23e634f401aeaaa76b;hpb=c802622f935af83bb791ded58056428d6be31d0a;p=lilypond.git

diff --git a/lily/time-signature-performer.cc b/lily/time-signature-performer.cc
index 4c2076fd00..30627f2b3c 100644
--- a/lily/time-signature-performer.cc
+++ b/lily/time-signature-performer.cc
@@ -3,19 +3,36 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 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 ()
@@ -24,43 +41,30 @@ Time_signature_performer::~Time_signature_performer ()
 
 
 void
-Time_signature_performer::do_process_music ()
+Time_signature_performer::create_audio_elements ()
 {
-  if (time_signature_req_l_)
+  SCM fr = get_property ("timeSignatureFraction");
+  if (ly_c_pair_p (fr) && !ly_c_equal_p (fr, prev_fraction_))
     {
-      int b = gh_scm2int (time_signature_req_l_->get_mus_property ("beats"));
-      int o = gh_scm2int (time_signature_req_l_->get_mus_property ("one-beat"));      
+      prev_fraction_ = fr;
+      int b = scm_to_int (ly_car (fr));
+      int o = scm_to_int (ly_cdr (fr));
       
-      audio_p_ = new Audio_time_signature (b,o);
-      Audio_element_info info (audio_p_, time_signature_req_l_);
+      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,"","","","","","");