X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmetronome-engraver.cc;h=cfae9a5ee87c4f0cba3e124df239e78c3de013b6;hb=2efffc3975f6cc22b657cd8a09c27710968ce81c;hp=752b3358a94a3fcc8624399985ec3ea7cf8cbf7f;hpb=163225c0cbb1055dfd3614615350ab9f3aaba74c;p=lilypond.git

diff --git a/lily/metronome-engraver.cc b/lily/metronome-engraver.cc
index 752b3358a9..cfae9a5ee8 100644
--- a/lily/metronome-engraver.cc
+++ b/lily/metronome-engraver.cc
@@ -3,21 +3,23 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2004 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998--2006 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include <cctype>
+using namespace std;
 
-#include "note-column.hh"
-#include "bar-line.hh"
-#include "time-signature.hh"
-#include "engraver-group-engraver.hh"
+#include "engraver.hh"
+
+#include "item.hh"
 #include "context.hh"
+#include "grob-array.hh"
+#include "duration.hh"
 
 /**
-  put stuff over or next to  bars.  Examples: bar numbers, marginal notes,
-  rehearsal marks.
- */
+   put stuff over or next to  bars.  Examples: bar numbers, marginal notes,
+   rehearsal marks.
+*/
 class Metronome_mark_engraver : public Engraver
 {
 public:
@@ -25,79 +27,86 @@ public:
 protected:
   Item *text_;
   Grob *bar_line_;
-  Music *mark_ev_;
+
+  SCM last_duration_;
+  SCM last_count_;
   
-  void create_items (Music*);
 protected:
-  virtual void stop_translation_timestep ();
-  virtual bool try_music (Music *ev);
-  virtual void process_music ();
+  virtual void derived_mark () const;
+  void stop_translation_timestep ();
+  void process_music ();
 };
 
 Metronome_mark_engraver::Metronome_mark_engraver ()
 {
   text_ = 0;
-  mark_ev_ = 0;
+  last_duration_ = SCM_EOL;
+  last_count_ = SCM_EOL;
 }
 
-void 
-Metronome_mark_engraver::stop_translation_timestep ()
+void
+Metronome_mark_engraver::derived_mark () const
 {
-  if (text_)
-    {
-      Grob*mc = unsmob_grob (get_property( "currentMusicalColumn"));
-      text_->set_parent (mc, X_AXIS);
-      text_->set_property ("side-support-elements" , get_property ("stavesFound"));
-      
-      text_ = 0;
-    }
-  mark_ev_ = 0;
+  scm_gc_mark (last_count_);
+  scm_gc_mark (last_duration_);
 }
 
-
 void
-Metronome_mark_engraver::create_items (Music *rq)
+Metronome_mark_engraver::stop_translation_timestep ()
 {
   if (text_)
-    return;
-
-  text_ = make_item ("MetronomeMark", rq->self_scm () );
-
-}
-
+    {
+      Grob *mc = unsmob_grob (get_property ("currentMusicalColumn"));
+      text_->set_parent (mc, X_AXIS);
+      text_->set_object ("side-support-elements",
+			 grob_list_to_grob_array (get_property ("stavesFound")));
 
-bool
-Metronome_mark_engraver::try_music (Music* r)
-{
-  mark_ev_ = r;
-  return true;
+      text_ = 0;
+    }
 }
 
 void
 Metronome_mark_engraver::process_music ()
 {
-  if (mark_ev_)
+  SCM count = get_property ("tempoUnitCount");
+  SCM duration = get_property ("tempoUnitDuration");
+  
+  if (unsmob_duration (duration)
+      && scm_is_number (count)
+      && !(ly_is_equal (count, last_count_)
+	   && ly_is_equal (duration, last_duration_)))
     {
-      create_items (mark_ev_);
+      text_ = make_item ("MetronomeMark", SCM_EOL);
 
       SCM proc = get_property ("metronomeMarkFormatter");
-      SCM result= scm_call_2 (proc, mark_ev_->self_scm (),
-			      context ()->self_scm ()); 
-      
+      SCM result = scm_call_3 (proc,
+			       duration,
+			       count,
+			       context ()->self_scm ());
+
       text_->set_property ("text", result);
     }
+
+  last_duration_ = duration;
+  last_count_ = count;
 }
 
-ENTER_DESCRIPTION (Metronome_mark_engraver,
-/* descr */       "Engrave metro nome marking. This delegates the formatting work "
-		   "to the function in the metronomeMarkFormatter property. "
-		   "The mark is put over all staves. "
-		   "The staves are taken from the @code{stavesFound} property, "
-		   "which is maintained by @code{@ref{Staff_collecting_engraver}}. "
-	
-		   ,
-/* creats*/       "MetronomeMark",
-/* accepts */     "metronome-change-event",
-		   /* acks  */       "",
-/* reads */       "stavesFound metronomeMarkFormatter",
-/* write */       "");
+#include "translator.icc"
+
+ADD_TRANSLATOR (Metronome_mark_engraver,
+		/* doc */ "Engrave metro nome marking. This delegates the formatting work "
+		"to the function in the metronomeMarkFormatter property. "
+		"The mark is put over all staves. "
+		"The staves are taken from the @code{stavesFound} property, "
+		"which is maintained by @code{@ref{Staff_collecting_engraver}}. ",
+		/* create */ "MetronomeMark",
+		/* accept */ "",
+
+		/* read */
+		"stavesFound "
+		"metronomeMarkFormatter "
+		"tempoUnitDuration "
+		"tempoUnitCount "
+		,
+
+		/* write */ "");