Merge branch 'master' of /home/jcharles/GIT/Lily/. into translation

[lilypond.git] / lily / drum-note-performer.cc

diff --git a/lily/drum-note-performer.cc b/lily/drum-note-performer.cc
index f8225d22ed5d6383fbe17e8c1eecd8fad877ae8a..93f648f3d765b4047afc23803e1e6eb8eda3a840 100644 (file)
--- a/lily/drum-note-performer.cc
+++ b/lily/drum-note-performer.cc
@@ -25,8 +25,6 @@
 #include "translator.icc"
 #include "warn.hh"
 
-using std::vector;
-
 class Drum_note_performer : public Performer
 {
 public:
@@ -35,7 +33,7 @@ public:
 protected:
   void stop_translation_timestep ();
   void process_music ();
-  DECLARE_TRANSLATOR_LISTENER (note);
+  void listen_note (Stream_event *);
 private:
   vector<Stream_event *> note_evs_;
 };
@@ -98,13 +96,18 @@ Drum_note_performer::stop_translation_timestep ()
   note_evs_.clear ();
 }
 
-IMPLEMENT_TRANSLATOR_LISTENER (Drum_note_performer, note);
 void
 Drum_note_performer::listen_note (Stream_event *ev)
 {
   note_evs_.push_back (ev);
 }
 
+void
+Drum_note_performer::boot ()
+{
+  ADD_LISTENER (Drum_note_performer, note);
+}
+
 ADD_TRANSLATOR (Drum_note_performer,
                 /* doc */
                 "Play drum notes.",