X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fslur-performer.cc;h=422f065fd261b0db60504472cee4688216d0c06e;hb=5144f52804a78e5eb02007f0d6e5857a46f78a6b;hp=020160708ca65b553d42ea06a5cecaeea4babe93;hpb=df79e4cb4644f934f18694b4bcb7e57690ee3163;p=lilypond.git

diff --git a/lily/slur-performer.cc b/lily/slur-performer.cc
index 020160708c..422f065fd2 100644
--- a/lily/slur-performer.cc
+++ b/lily/slur-performer.cc
@@ -3,36 +3,47 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2004 Jan Nieuwenhuizen <janneke@gnu.org>
- */
+  (c) 1996--2009 Jan Nieuwenhuizen <janneke@gnu.org>
+*/
 
 #include "performer.hh"
-#include "event.hh"
 #include "audio-item.hh"
 #include "audio-column.hh"
 #include "global-context.hh"
+#include "stream-event.hh"
 #include "warn.hh"
 
+#include "translator.icc"
+
 /*
   this is C&P from beam_performer.
- */
+*/
 
-class Slur_performer : public Performer {
+class Slur_performer : public Performer
+{
 public:
   TRANSLATOR_DECLARATIONS (Slur_performer);
-  
+
 protected:
-  virtual bool try_music (Music *ev) ;
-  virtual void start_translation_timestep ();
-  virtual void process_music ();
+  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_;
 };
 
-void 
+Slur_performer::Slur_performer ()
+{
+  slur_ = false;
+  start_ev_ = 0;
+  now_stop_ev_ = 0;
+}
+
+void
 Slur_performer::process_music ()
 {
   if (now_stop_ev_)
@@ -48,11 +59,10 @@ Slur_performer::process_music ()
     }
 }
 
-
 void
 Slur_performer::set_melisma (bool ml)
 {
-  daddy_context_->set_property ("slurMelismaBusy", ml ? SCM_BOOL_T :SCM_BOOL_F);
+  context ()->set_property ("slurMelismaBusy", ml ? SCM_BOOL_T : SCM_BOOL_F);
 }
 
 void
@@ -61,31 +71,29 @@ Slur_performer::start_translation_timestep ()
   start_ev_ = 0;
   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"));
-
-      if (d == START)
-	{
-	  start_ev_ = m;
-	}
-      else if (d==STOP)
-	{
-	  now_stop_ev_ = m;
-	}
-      return true;
-    }
-  return false;
+  Direction d = to_dir (ev->get_property ("span-direction"));
+
+  if (d == START)
+    start_ev_ = ev;
+  else if (d == STOP)
+    now_stop_ev_ = ev;
 }
 
-ENTER_DESCRIPTION (Slur_performer,"","",
-		  "slur-event","","","");
+ADD_TRANSLATOR (Slur_performer,
+		/* doc */
+		"",
 
-Slur_performer::Slur_performer ()
-{
-  slur_ = false;
-}
+		/* create */
+		"",
+
+		/* read */
+		"",
+
+		/* write */
+		""
+		);