X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpiano-pedal-performer.cc;h=4083c468f915279fbb19ea5f2d0da57264f6f13d;hb=9f3572d98bb948c9689cd1f75401a029451fa001;hp=3b51fd83ec86808f538cc105dd38184a91c5e789;hpb=04265f11d1f21416ccebd2dcaa1d903dc781b36e;p=lilypond.git

diff --git a/lily/piano-pedal-performer.cc b/lily/piano-pedal-performer.cc
index 3b51fd83ec..4083c468f9 100644
--- a/lily/piano-pedal-performer.cc
+++ b/lily/piano-pedal-performer.cc
@@ -10,12 +10,7 @@
 
 #include "audio-item.hh"
 #include "international.hh"
-#include "stream-event.hh"
-#include "warn.hh"
-
-#include "translator.icc"
-
-typedef enum Pedal_type {SOSTENUTO, SUSTAIN, UNA_CORDA, NUM_PEDAL_TYPES};
+#include "music.hh"
 
 /**
    perform Piano pedals
@@ -24,77 +19,71 @@ class Piano_pedal_performer : public Performer
 {
   struct Pedal_info
   {
-    Stream_event *start_event_;
-    Drul_array<Stream_event *> event_drul_;
+    char const *name_;
+    Music *start_event_;
+    Drul_array<Music *> event_drul_;
   };
 
 public:
   TRANSLATOR_DECLARATIONS (Piano_pedal_performer);
+  ~Piano_pedal_performer ();
 
 protected:
   virtual void initialize ();
-  static const char *pedal_type_str (int t);
+  virtual bool try_music (Music *);
   void process_music ();
   void stop_translation_timestep ();
   void start_translation_timestep ();
-  DECLARE_TRANSLATOR_LISTENER (sustain);
-  DECLARE_TRANSLATOR_LISTENER (una_corda);
-  DECLARE_TRANSLATOR_LISTENER (sostenuto);
+
 private:
   vector<Audio_piano_pedal*> audios_;
-  Pedal_info info_alist_[NUM_PEDAL_TYPES];
+  Pedal_info *info_alist_;
 };
 
 Piano_pedal_performer::Piano_pedal_performer ()
 {
+  info_alist_ = 0;
 }
 
-const char *
-Piano_pedal_performer::pedal_type_str (int t)
+Piano_pedal_performer::~Piano_pedal_performer ()
 {
-  switch (t)
-    {
-    case SOSTENUTO: 
-      return "Sostenuto";
-    case SUSTAIN:
-      return "Sustain";
-    case UNA_CORDA: 
-      return "UnaCorda";
-    default:
-      programming_error ("Unknown pedal type");
-      return 0;
-    }
+  delete[] info_alist_;
 }
 
 void
 Piano_pedal_performer::initialize ()
 {
+  info_alist_ = new Pedal_info[4];
   Pedal_info *p = info_alist_;
 
-  for (int i = 0; i < NUM_PEDAL_TYPES; i++, p++)
+  char *names [] = { "Sostenuto", "Sustain", "UnaCorda", 0 };
+  char **np = names;
+  do
     {
+      p->name_ = *np;
       p->event_drul_[START] = 0;
       p->event_drul_[STOP] = 0;
       p->start_event_ = 0;
+
+      p++;
     }
+  while (* (np++));
 }
 
 void
 Piano_pedal_performer::process_music ()
 {
-  Pedal_info *p = info_alist_;
+  for (Pedal_info *p = info_alist_; p && p->name_; p++)
 
-  for (int i = 0; i < NUM_PEDAL_TYPES; i++, p++)
     {
-      string pedal_type = pedal_type_str (i);
       if (p->event_drul_[STOP])
 	{
 	  if (!p->start_event_)
-	    p->event_drul_[STOP]->origin ()->warning (_f ("can't find start of piano pedal: `%s'", pedal_type));
+	    p->event_drul_[STOP]->origin ()->warning (_f ("can't find start of piano pedal: `%s'", string (p->name_)));
 	  else
 	    {
 	      Audio_piano_pedal *a = new Audio_piano_pedal;
-	      a->type_string_ = pedal_type;
+	      a->type_string_ = string (p->name_);
 	      a->dir_ = STOP;
 	      audios_.push_back (a);
               Audio_element_info info(a, p->event_drul_[STOP]);
@@ -107,7 +96,7 @@ Piano_pedal_performer::process_music ()
 	{
 	  p->start_event_ = p->event_drul_[START];
 	  Audio_piano_pedal *a = new Audio_piano_pedal;
-	  a->type_string_ = pedal_type;
+	  a->type_string_ = string (p->name_);
 	  a->dir_ = START;
 	  audios_.push_back (a);
           Audio_element_info info(a, p->event_drul_[START]);
@@ -121,43 +110,42 @@ Piano_pedal_performer::process_music ()
 void
 Piano_pedal_performer::stop_translation_timestep ()
 {
+  for (vsize i = 0; i < audios_.size (); i++)
+    play_element (audios_[i]);
   audios_.clear ();
 }
 
 void
 Piano_pedal_performer::start_translation_timestep ()
 {
-  Pedal_info *p = info_alist_;
-  for (int i = 0; i < NUM_PEDAL_TYPES; i++, p++)
+  for (Pedal_info *p = info_alist_; p && p->name_; p++)
     {
       p->event_drul_[STOP] = 0;
       p->event_drul_[START] = 0;
     }
 }
 
-IMPLEMENT_TRANSLATOR_LISTENER (Piano_pedal_performer, sostenuto);
-void
-Piano_pedal_performer::listen_sostenuto (Stream_event *r)
-{
-  Direction d = to_dir (r->get_property ("span-direction"));
-  info_alist_[SOSTENUTO].event_drul_[d] = r;
-}
-
-IMPLEMENT_TRANSLATOR_LISTENER (Piano_pedal_performer, sustain);
-void
-Piano_pedal_performer::listen_sustain (Stream_event *r)
+bool
+Piano_pedal_performer::try_music (Music *r)
 {
-  Direction d = to_dir (r->get_property ("span-direction"));
-  info_alist_[SUSTAIN].event_drul_[d] = r;
+  if (r->is_mus_type ("pedal-event"))
+    {
+      for (Pedal_info *p = info_alist_; p->name_; p++)
+	{
+	  string nm = p->name_ + string ("Event");
+	  if (ly_is_equal (r->get_property ("name"),
+			   scm_str2symbol (nm.c_str ())))
+	    {
+	      Direction d = to_dir (r->get_property ("span-direction"));
+	      p->event_drul_[d] = r;
+	      return true;
+	    }
+	}
+    }
+  return false;
 }
 
-IMPLEMENT_TRANSLATOR_LISTENER (Piano_pedal_performer, una_corda);
-void
-Piano_pedal_performer::listen_una_corda (Stream_event *r)
-{
-  Direction d = to_dir (r->get_property ("span-direction"));
-  info_alist_[UNA_CORDA].event_drul_[d] = r;
-}
+#include "translator.icc"
 
 ADD_TRANSLATOR (Piano_pedal_performer, "", "",
 		"pedal-event",