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

diff --git a/lily/time-signature-performer.cc b/lily/time-signature-performer.cc
index 4c2076fd00..5ca26e66da 100644
--- a/lily/time-signature-performer.cc
+++ b/lily/time-signature-performer.cc
@@ -1,66 +1,96 @@
 /*
-  time-signature-performer.cc -- implement Time_signature_performer
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2014 Jan Nieuwenhuizen <janneke@gnu.org>
 
-  (c)  1997--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "time-signature-performer.hh"
-#include "command-request.hh"
 #include "audio-item.hh"
+#include "performer.hh"
+#include "protected-scm.hh"
+
+class Time_signature_performer : public Performer
+{
+public:
+  TRANSLATOR_DECLARATIONS (Time_signature_performer);
+  ~Time_signature_performer ();
+
+protected:
 
-ADD_THIS_TRANSLATOR (Time_signature_performer);
+  void stop_translation_timestep ();
+  void process_music ();
+  virtual void derived_mark () const;
+  SCM prev_fraction_;
+private:
+
+  Audio_time_signature *audio_;
+};
+
+void
+Time_signature_performer::derived_mark () const
+{
+  scm_gc_mark (prev_fraction_);
+}
 
 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_process_music ()
+Time_signature_performer::process_music ()
 {
-  if (time_signature_req_l_)
+  SCM fr = get_property ("timeSignatureFraction");
+  if (scm_is_pair (fr) && !ly_is_equal (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"));      
-      
-      audio_p_ = new Audio_time_signature (b,o);
-      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 ()
+Time_signature_performer::stop_translation_timestep ()
 {
-  if (audio_p_)
+  if (audio_)
     {
-      play_element (audio_p_);
-      audio_p_ = 0;
+      audio_ = 0;
     }
 }
 
-bool
-Time_signature_performer::do_try_music (Music* req_l)
-{
-  if (time_signature_req_l_)
-    return false;
+#include "translator.icc"
 
-  if (Time_signature_change_req *t =
-      dynamic_cast <Time_signature_change_req *> (req_l))
-    {
-      time_signature_req_l_ = t;
-      return true;
-    }
+ADD_TRANSLATOR (Time_signature_performer,
+                /* doc */
+                "",
 
-  return false;
-}
+                /* create */
+                "",
+
+                /* read */
+                "",
 
+                /* write */
+                ""
+               );