* python/convertrules.py (conv): warning on \tempo{}

[lilypond.git] / lily / metronome-engraver.cc

diff --git a/lily/metronome-engraver.cc b/lily/metronome-engraver.cc
index 21eb711a24636c21f8c480c8238ead3397b5f8fa..40be81e22181a15f51b3505c49fdb9b67b900162 100644 (file)
--- a/lily/metronome-engraver.cc
+++ b/lily/metronome-engraver.cc
@@ -11,9 +11,10 @@ using namespace std;
 
 #include "engraver.hh"
 
-#include "note-column.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,
@@ -26,19 +27,28 @@ public:
 protected:
   Item *text_;
   Grob *bar_line_;
-  Music *mark_ev_;
 
-  void create_items (Music *);
+  SCM last_duration_;
+  SCM last_count_;
+  
 protected:
+  virtual void derived_mark () const;
   void stop_translation_timestep ();
-  virtual bool try_music (Music *ev);
   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::derived_mark () const
+{
+  scm_gc_mark (last_count_);
+  scm_gc_mark (last_duration_);
 }
 
 void
@@ -53,37 +63,31 @@ Metronome_mark_engraver::stop_translation_timestep ()
 
       text_ = 0;
     }
-  mark_ev_ = 0;
-}
-
-void
-Metronome_mark_engraver::create_items (Music *rq)
-{
-  if (text_)
-    return;
-
-  text_ = make_item ("MetronomeMark", rq->self_scm ());
-}
-
-bool
-Metronome_mark_engraver::try_music (Music *r)
-{
-  mark_ev_ = r;
-  return true;
 }
 
 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 (),
+      SCM result = scm_call_3 (proc,
+                              duration,
+                              count,
                               context ()->self_scm ());
 
       text_->set_property ("text", result);
+
+      last_duration_ = duration;
+      last_count_ = count;
     }
 }
 
@@ -96,6 +100,13 @@ ADD_TRANSLATOR (Metronome_mark_engraver,
                "The staves are taken from the @code{stavesFound} property, "
                "which is maintained by @code{@ref{Staff_collecting_engraver}}. ",
                /* create */ "MetronomeMark",
-               /* accept */ "metronome-change-event",
-               /* read */ "stavesFound metronomeMarkFormatter",
+               /* accept */ "",
+
+               /* read */
+               "stavesFound "
+               "metronomeMarkFormatter "
+               "tempoUnitDuration "
+               "tempoUnitCount "
+               ,
+
                /* write */ "");