X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fballoon-engraver.cc;h=610a9906f0213b520b07eb82f2f406e6ca426ecf;hb=a6a51abfd0195a3cf7d6ea095cf69808852f21ce;hp=d13c527ef6835114b4910252dd8652fc1208aab4;hpb=a9d9433bc7b95cb2d4b3d96eefce7a8437c0d44e;p=lilypond.git

diff --git a/lily/balloon-engraver.cc b/lily/balloon-engraver.cc
index d13c527ef6..610a9906f0 100644
--- a/lily/balloon-engraver.cc
+++ b/lily/balloon-engraver.cc
@@ -1,10 +1,20 @@
-/* 
-  balloon-engraver.cc -- implement Balloon_engraver
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 2006--2009 Han-Wen Nienhuys <hanwen@lilypond.org>
-  
+/*
+  This file is part of LilyPond, the GNU music typesetter.
+
+  Copyright (C) 2006--2015 Han-Wen Nienhuys <hanwen@lilypond.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 "engraver.hh"
@@ -18,16 +28,15 @@ class Balloon_engraver : public Engraver
 {
   TRANSLATOR_DECLARATIONS (Balloon_engraver);
 
-  DECLARE_TRANSLATOR_LISTENER (annotate_output);
-  DECLARE_ACKNOWLEDGER (grob);
+  void listen_annotate_output (Stream_event *);
+  void acknowledge_grob (Grob_info);
   vector<Stream_event *> events_;
 
   void stop_translation_timestep ();
-  
-  void balloonify (Grob *, Stream_event *); 
+
+  void balloonify (Grob *, Stream_event *);
 };
 
-IMPLEMENT_TRANSLATOR_LISTENER (Balloon_engraver, annotate_output);
 void
 Balloon_engraver::listen_annotate_output (Stream_event *ev)
 {
@@ -40,14 +49,15 @@ Balloon_engraver::stop_translation_timestep ()
   events_.clear ();
 }
 
-Balloon_engraver::Balloon_engraver ()
+Balloon_engraver::Balloon_engraver (Context *c)
+  : Engraver (c)
 {
 }
 
 void
 Balloon_engraver::balloonify (Grob *g, Stream_event *event)
 {
-  Grob * b = make_item ("BalloonTextItem", event->self_scm ());
+  Grob *b = make_item ("BalloonTextItem", event->self_scm ());
   b->set_property ("text", event->get_property ("text"));
   b->set_parent (g, Y_AXIS);
   b->set_parent (g, X_AXIS);
@@ -57,38 +67,42 @@ void
 Balloon_engraver::acknowledge_grob (Grob_info info)
 {
   Stream_event *cause = info.event_cause ();
-  
+
   SCM arts = cause ? cause->get_property ("articulations") : SCM_EOL;
   for (SCM s = arts; scm_is_pair (s); s = scm_cdr (s))
     {
-      Stream_event *e = unsmob_stream_event (scm_car (s));
+      Stream_event *e = unsmob<Stream_event> (scm_car (s));
       if (e->in_event_class ("annotate-output-event"))
-	{
-	  balloonify (info.grob (), e);
-	}
+        {
+          balloonify (info.grob (), e);
+        }
     }
 
   for (vsize i = 0; i < events_.size (); i++)
     {
       if (info.grob ()->name () == ly_symbol2string (events_[i]->get_property ("symbol")))
-	balloonify (info.grob (), events_[i]);
+        balloonify (info.grob (), events_[i]);
     }
 }
 
 
-  
-ADD_ACKNOWLEDGER (Balloon_engraver, grob);
-  
+void
+Balloon_engraver::boot ()
+{
+  ADD_LISTENER (Balloon_engraver, annotate_output);
+  ADD_ACKNOWLEDGER (Balloon_engraver, grob);
+}
+
 ADD_TRANSLATOR (Balloon_engraver,
-	       /* doc */
-	       "Create balloon texts.",
+                /* doc */
+                "Create balloon texts.",
 
-	       /* create */
-	       "BalloonTextItem ",
+                /* create */
+                "BalloonTextItem ",
 
-	       /*read*/
-	       "",
+                /*read*/
+                "",
 
-	       /*write*/
-	       ""
-	       );
+                /*write*/
+                ""
+               );