X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fslur-performer.cc;h=20d5d5a4fc8b6ff3194493637960a67da84904e9;hb=5091a221086ba923451781a1d51a2a715369b7e4;hp=b51dc555569d56173e62413202c6b1518ddf4c6d;hpb=2c22efe5a46a37065b10c3f51c5d7db00d07d318;p=lilypond.git

diff --git a/lily/slur-performer.cc b/lily/slur-performer.cc
index b51dc55556..20d5d5a4fc 100644
--- a/lily/slur-performer.cc
+++ b/lily/slur-performer.cc
@@ -3,15 +3,17 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2005 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1996--2007 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "performer.hh"
 #include "audio-item.hh"
 #include "audio-column.hh"
 #include "global-context.hh"
+#include "stream-event.hh"
 #include "warn.hh"
-#include "music.hh"
+
+#include "translator.icc"
 
 /*
   this is C&P from beam_performer.
@@ -23,13 +25,14 @@ public:
   TRANSLATOR_DECLARATIONS (Slur_performer);
 
 protected:
-  virtual bool try_music (Music *ev);
   void start_translation_timestep ();
   void process_music ();
   void set_melisma (bool);
+  
+  DECLARE_TRANSLATOR_LISTENER (slur);
 private:
-  Music *start_ev_;
-  Music *now_stop_ev_;
+  Stream_event *start_ev_;
+  Stream_event *now_stop_ev_;
   bool slur_;
 };
 
@@ -69,26 +72,18 @@ Slur_performer::start_translation_timestep ()
   now_stop_ev_ = 0;
 }
 
-bool
-Slur_performer::try_music (Music *m)
+IMPLEMENT_TRANSLATOR_LISTENER (Slur_performer, slur);
+void
+Slur_performer::listen_slur (Stream_event *ev)
 {
-  if (m->is_mus_type ("slur-event"))
-    {
-      Direction d = to_dir (m->get_property ("span-direction"));
+  Direction d = to_dir (ev->get_property ("span-direction"));
 
-      if (d == START)
-	start_ev_ = m;
-      else if (d == STOP)
-	now_stop_ev_ = m;
-      return true;
-    }
-  return false;
+  if (d == START)
+    start_ev_ = ev;
+  else if (d == STOP)
+    now_stop_ev_ = ev;
 }
 
-#include "translator.icc"
-
 ADD_TRANSLATOR (Slur_performer,
 		"", "",
-		"slur-event",
 		"", "");
-