]> git.donarmstrong.com Git - lilypond.git/blobdiff - lily/piano-pedal-performer.cc
*** empty log message ***
[lilypond.git] / lily / piano-pedal-performer.cc
index 675ed9140d1628f509bad4a3a846cd6b61185f9a..84f540f323b01b37b85cec059be1ae3da28be043 100644 (file)
@@ -3,12 +3,12 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  2000 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c)  2000--2003 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "performer.hh"
-#include "command-request.hh"
-#include "musical-request.hh"
+
+#include "event.hh"
 #include "audio-item.hh"
 
 /**
@@ -19,8 +19,8 @@ class Piano_pedal_performer : public Performer
   struct Pedal_info
   {
     char const *name_;
-    Span_req* start_req_;
-    Drul_array<Span_req*> req_l_drul_;
+    Music* start_req_;
+    Drul_array<Music*> req_l_drul_;
   };
 
 public:
@@ -125,18 +125,23 @@ Piano_pedal_performer::start_translation_timestep ()
 bool
 Piano_pedal_performer::try_music (Music* r)
 {
 if (Span_req * s = dynamic_cast<Span_req*> (r))
if  (r->is_mus_type ("pedal-event"))
     {
       for (Pedal_info*p = info_alist_; p->name_; p ++)
        {
-         if (scm_equal_p (s->get_mus_property ("span-type"),
-                          ly_str02scm (p->name_)) == SCM_BOOL_T)
+         String nm = p->name_ + String ("Event");
+         if (gh_equal_p (r->get_mus_property ("name") ,
+                         scm_makfrom0str (nm.to_str0())))
            {
-             p->req_l_drul_[s->get_span_dir ()] = s;
+             Direction d = to_dir (r->get_mus_property ("span-direction"));
+             p->req_l_drul_[d] = r;
              return true;
            }
        }
     }
   return false;
 }
-ENTER_DESCRIPTION (Piano_pedal_performer, "","","","","" );
+
+ENTER_DESCRIPTION (Piano_pedal_performer, "","",
+                  "pedal-event",
+                  "","","" );