X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Farpeggio-engraver.cc;h=d67d9da120269ae3cd4d51de49cf962d6eb3c697;hb=51522dcf41e4178a0e16fada95a4e87cefd1d0b4;hp=b488e1be6468fe3d94d8a43cbc9d4511a8f45a6a;hpb=108cf0e8c08c8e15e2a800feb161cfad9057daa8;p=lilypond.git

diff --git a/lily/arpeggio-engraver.cc b/lily/arpeggio-engraver.cc
index b488e1be64..d67d9da120 100644
--- a/lily/arpeggio-engraver.cc
+++ b/lily/arpeggio-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2005 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2000--2006 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "engraver.hh"
@@ -13,6 +13,7 @@
 #include "stem.hh"
 #include "rhythmic-head.hh"
 #include "side-position-interface.hh"
+#include "stream-event.hh"
 #include "note-column.hh"
 
 #include "translator.icc"
@@ -28,10 +29,10 @@ public:
 protected:
   void process_music ();
   void stop_translation_timestep ();
-  virtual bool try_music (Music *);
+  DECLARE_TRANSLATOR_LISTENER (arpeggio);
 private:
   Item *arpeggio_;
-  Music *arpeggio_event_;
+  Stream_event *arpeggio_event_;
 };
 
 Arpeggio_engraver::Arpeggio_engraver ()
@@ -40,12 +41,11 @@ Arpeggio_engraver::Arpeggio_engraver ()
   arpeggio_event_ = 0;
 }
 
-bool
-Arpeggio_engraver::try_music (Music *m)
+IMPLEMENT_TRANSLATOR_LISTENER (Arpeggio_engraver, arpeggio);
+void Arpeggio_engraver::listen_arpeggio (Stream_event *ev)
 {
-  if (!arpeggio_event_)
-    arpeggio_event_ = m;
-  return true;
+  arpeggio_event_ = ev;
+  ev->protect ();
 }
 
 void
@@ -84,7 +84,10 @@ void
 Arpeggio_engraver::process_music ()
 {
   if (arpeggio_event_)
-    arpeggio_ = make_item ("Arpeggio", arpeggio_event_->self_scm ());
+    {
+      arpeggio_ = make_item ("Arpeggio", arpeggio_event_->self_scm ());
+      arpeggio_event_->unprotect ();
+    }
 }
 
 void
@@ -94,13 +97,13 @@ Arpeggio_engraver::stop_translation_timestep ()
   arpeggio_event_ = 0;
 }
 
-ADD_ACKNOWLEDGER (Arpeggio_engraver, stem)
-  ADD_ACKNOWLEDGER (Arpeggio_engraver, rhythmic_head)
-  ADD_ACKNOWLEDGER (Arpeggio_engraver, note_column)
+ADD_ACKNOWLEDGER (Arpeggio_engraver, stem);
+ADD_ACKNOWLEDGER (Arpeggio_engraver, rhythmic_head);
+ADD_ACKNOWLEDGER (Arpeggio_engraver, note_column);
 
-  ADD_TRANSLATOR (Arpeggio_engraver,
-		  /* doc */ "Generate an Arpeggio symbol",
-		  /* create */ "Arpeggio",
-		  /* accept */ "arpeggio-event",
-		  /* read */ "",
-		  /* write */ "");
+ADD_TRANSLATOR (Arpeggio_engraver,
+		/* doc */ "Generate an Arpeggio symbol",
+		/* create */ "Arpeggio",
+		/* accept */ "arpeggio-event",
+		/* read */ "",
+		/* write */ "");