X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fpiano-pedal-performer.cc;h=fd32e92684349e8f3dad98b04b8ce2c5fdecab28;hb=4cb2a5267e16d233b13089ab37a467c3d19da235;hp=bed707a87c3a89db2d17edeae83efef201f59288;hpb=3b3e161088f1a4be942e67729d0f89f0e8d31c51;p=lilypond.git

diff --git a/lily/piano-pedal-performer.cc b/lily/piano-pedal-performer.cc
index bed707a87c..fd32e92684 100644
--- a/lily/piano-pedal-performer.cc
+++ b/lily/piano-pedal-performer.cc
@@ -10,8 +10,6 @@
 #include "command-request.hh"
 #include "musical-request.hh"
 #include "audio-item.hh"
-#include "dictionary.hh"
-#include "dictionary-iter.hh"
 
 /**
    perform Piano pedals
@@ -26,8 +24,7 @@ class Piano_pedal_performer : public Performer
   };
 
 public:
-  VIRTUAL_COPY_CONS (Translator);
-  Piano_pedal_performer ();
+  TRANSLATOR_DECLARATIONS(Piano_pedal_performer);
   ~Piano_pedal_performer ();
   
 protected:
@@ -42,14 +39,12 @@ private:
   Pedal_info * info_alist_;
 };
 
-ADD_THIS_TRANSLATOR (Piano_pedal_performer);
-
 Piano_pedal_performer::Piano_pedal_performer ()
 {
   info_alist_ = 0;
 }
 
-Piano_pedal_performer::~Piano_pedal_performer()
+Piano_pedal_performer::~Piano_pedal_performer ()
 {
   delete[] info_alist_;
 }
@@ -60,7 +55,7 @@ Piano_pedal_performer::initialize ()
   info_alist_ = new Pedal_info[4];
   Pedal_info *p = info_alist_;
 
-  char * names [] = { "Sostenuto", "Sustain", "UnaChorda", 0  };
+  char * names [] = { "Sostenuto", "Sustain", "UnaCorda", 0  };
   char **np = names ;
   do
     {
@@ -71,7 +66,7 @@ Piano_pedal_performer::initialize ()
 
       p++;
     }
-  while (*(np ++));
+  while (* (np ++));
 }
 
 void
@@ -84,7 +79,7 @@ Piano_pedal_performer::create_audio_elements ()
 	{
 	  if (!p->start_req_l_)
 	    {
-	      p->req_l_drul_[STOP]->origin ()->warning (_f ("can't find start of piano pedal: %s", String (p->name_)));
+	      p->req_l_drul_[STOP]->origin ()->warning (_f ("can't find start of piano pedal: `%s'", String (p->name_)));
 	    }
 	  else
 	    {
@@ -130,17 +125,18 @@ Piano_pedal_performer::start_translation_timestep ()
 bool
 Piano_pedal_performer::try_music (Music* r)
 {
-  if (Span_req * s = dynamic_cast<Span_req*>(r))
+  if (Span_req * s = dynamic_cast<Span_req*> (r))
     {
       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)
 	    {
-	      p->req_l_drul_[s->get_span_dir()] = s;
+	      p->req_l_drul_[s->get_span_dir ()] = s;
 	      return true;
 	    }
 	}
     }
   return false;
 }
+ENTER_DESCRIPTION (Piano_pedal_performer, "","","","","" );