Merge branch 'jneeman' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond into jneeman

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

diff --git a/lily/glissando-engraver.cc b/lily/glissando-engraver.cc
index 4bb180ef167e3da13f9cf0b80e203998760fbb6e..4c506df38d14efc8d4e9e47cdc327bea35a8f72e 100644 (file)
--- a/lily/glissando-engraver.cc
+++ b/lily/glissando-engraver.cc
@@ -6,10 +6,14 @@
   (c) 2000--2006 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-#include "warn.hh"
-#include "spanner.hh"
-#include "rhythmic-head.hh"
 #include "engraver.hh"
+#include "international.hh"
+#include "rhythmic-head.hh"
+#include "spanner.hh"
+#include "stream-event.hh"
+#include "warn.hh"
+
+#include "translator.icc"
 
 /**
    Create line-spanner grobs for glissandi lines that connect note
@@ -21,15 +25,16 @@ public:
   TRANSLATOR_DECLARATIONS (Glissando_engraver);
 
 protected:
+  DECLARE_TRANSLATOR_LISTENER (glissando);
   DECLARE_ACKNOWLEDGER (rhythmic_head);
   virtual void finalize ();
+
   void stop_translation_timestep ();
-  virtual bool try_music (Music *);
   void process_music ();
 private:
   Spanner *line_;
   Spanner *last_line_;
-  Music *event_;
+  Stream_event *event_;
 };
 
 Glissando_engraver::Glissando_engraver ()
@@ -38,15 +43,11 @@ Glissando_engraver::Glissando_engraver ()
   event_ = 0;
 }
 
-bool
-Glissando_engraver::try_music (Music *m)
+IMPLEMENT_TRANSLATOR_LISTENER (Glissando_engraver, glissando);
+void
+Glissando_engraver::listen_glissando (Stream_event *ev)
 {
-  if (!event_)
-    {
-      event_ = m;
-      return true;
-    }
-  return false;
+  ASSIGN_EVENT_ONCE (event_, ev);
 }
 
 void
@@ -72,6 +73,7 @@ Glissando_engraver::stop_translation_timestep ()
 {
   if (last_line_ && last_line_->get_bound (RIGHT))
     last_line_ = 0;
+
   if (line_)
     {
       if (last_line_)
@@ -87,7 +89,7 @@ Glissando_engraver::finalize ()
 {
   if (line_)
     {
-      String msg = _ ("unterminated glissando");
+      string msg = _ ("unterminated glissando");
 
       if (event_)
        event_->origin ()->warning (msg);
@@ -99,12 +101,9 @@ Glissando_engraver::finalize ()
     }
 }
 
-#include "translator.icc"
-
 ADD_ACKNOWLEDGER (Glissando_engraver, rhythmic_head);
 ADD_TRANSLATOR (Glissando_engraver,
                /* doc */ "Engrave a glissandi",
                /* create */ "Glissando",
-               /* accept */ "glissando-event",
                /* read */ "followVoice",
                /* write */ "");