X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpiano-pedal-performer.cc;h=cb5919cabc0e57e6d51015c1df886abcbf7dcbb0;hb=9c3ecc7d6e596e8151a58ce7ed0dd9e1b0802d1e;hp=4083c468f915279fbb19ea5f2d0da57264f6f13d;hpb=31568c504806f35aac420a394c9eab07abd9faa7;p=lilypond.git

diff --git a/lily/piano-pedal-performer.cc b/lily/piano-pedal-performer.cc
index 4083c468f9..cb5919cabc 100644
--- a/lily/piano-pedal-performer.cc
+++ b/lily/piano-pedal-performer.cc
@@ -3,14 +3,19 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2006 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2000--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "performer.hh"
 
 #include "audio-item.hh"
 #include "international.hh"
-#include "music.hh"
+#include "stream-event.hh"
+#include "warn.hh"
+
+#include "translator.icc"
+
+typedef enum Pedal_type {SOSTENUTO, SUSTAIN, UNA_CORDA, NUM_PEDAL_TYPES};
 
 /**
    perform Piano pedals
@@ -19,74 +24,80 @@ class Piano_pedal_performer : public Performer
 {
   struct Pedal_info
   {
-    char const *name_;
-    Music *start_event_;
-    Drul_array<Music *> event_drul_;
+    Stream_event *start_event_;
+    Drul_array<Stream_event *> event_drul_;
   };
 
 public:
   TRANSLATOR_DECLARATIONS (Piano_pedal_performer);
-  ~Piano_pedal_performer ();
 
 protected:
   virtual void initialize ();
-  virtual bool try_music (Music *);
+  static const char *pedal_type_str (int t);
   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_;
+  Pedal_info info_alist_[NUM_PEDAL_TYPES];
 };
 
 Piano_pedal_performer::Piano_pedal_performer ()
 {
-  info_alist_ = 0;
 }
 
-Piano_pedal_performer::~Piano_pedal_performer ()
+const char *
+Piano_pedal_performer::pedal_type_str (int t)
 {
-  delete[] info_alist_;
+  switch (t)
+    {
+    case SOSTENUTO: 
+      return "Sostenuto";
+    case SUSTAIN:
+      return "Sustain";
+    case UNA_CORDA: 
+      return "UnaCorda";
+    default:
+      programming_error ("Unknown pedal type");
+      return 0;
+    }
 }
 
 void
 Piano_pedal_performer::initialize ()
 {
-  info_alist_ = new Pedal_info[4];
   Pedal_info *p = info_alist_;
 
-  char *names [] = { "Sostenuto", "Sustain", "UnaCorda", 0 };
-  char **np = names;
-  do
+  for (int i = 0; i < NUM_PEDAL_TYPES; i++, p++)
     {
-      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 ()
 {
-  for (Pedal_info *p = info_alist_; p && p->name_; p++)
+  Pedal_info *p = info_alist_;
 
+  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'", string (p->name_)));
+	    p->event_drul_[STOP]->origin ()->warning (_f ("cannot find start of piano pedal: `%s'", pedal_type));
 	  else
 	    {
 	      Audio_piano_pedal *a = new Audio_piano_pedal;
-	      a->type_string_ = string (p->name_);
+	      a->type_string_ = pedal_type;
 	      a->dir_ = STOP;
 	      audios_.push_back (a);
-              Audio_element_info info(a, p->event_drul_[STOP]);
+              Audio_element_info info (a, p->event_drul_[STOP]);
               announce_element (info);
 	    }
 	  p->start_event_ = 0;
@@ -96,10 +107,10 @@ Piano_pedal_performer::process_music ()
 	{
 	  p->start_event_ = p->event_drul_[START];
 	  Audio_piano_pedal *a = new Audio_piano_pedal;
-	  a->type_string_ = string (p->name_);
+	  a->type_string_ = pedal_type;
 	  a->dir_ = START;
 	  audios_.push_back (a);
-          Audio_element_info info(a, p->event_drul_[START]);
+          Audio_element_info info (a, p->event_drul_[START]);
           announce_element (info);
 	}
       p->event_drul_[START] = 0;
@@ -110,43 +121,54 @@ 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 ()
 {
-  for (Pedal_info *p = info_alist_; p && p->name_; p++)
+  Pedal_info *p = info_alist_;
+  for (int i = 0; i < NUM_PEDAL_TYPES; i++, p++)
     {
       p->event_drul_[STOP] = 0;
       p->event_drul_[START] = 0;
     }
 }
 
-bool
-Piano_pedal_performer::try_music (Music *r)
+IMPLEMENT_TRANSLATOR_LISTENER (Piano_pedal_performer, sostenuto);
+void
+Piano_pedal_performer::listen_sostenuto (Stream_event *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;
+  Direction d = to_dir (r->get_property ("span-direction"));
+  info_alist_[SOSTENUTO].event_drul_[d] = r;
 }
 
-#include "translator.icc"
+IMPLEMENT_TRANSLATOR_LISTENER (Piano_pedal_performer, sustain);
+void
+Piano_pedal_performer::listen_sustain (Stream_event *r)
+{
+  Direction d = to_dir (r->get_property ("span-direction"));
+  info_alist_[SUSTAIN].event_drul_[d] = r;
+}
+
+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;
+}
+
+ADD_TRANSLATOR (Piano_pedal_performer,
+		/* doc */
+		"",
+
+		/* create */
+		"",
+
+		/* read */
+		"",
 
-ADD_TRANSLATOR (Piano_pedal_performer, "", "",
-		"pedal-event",
-		"", "");
+		/* write */
+		""
+		);