Fix some bugs in the dynamic engraver and PostScript backend

[lilypond.git] / lily / dynamic-performer.cc

diff --git a/lily/dynamic-performer.cc b/lily/dynamic-performer.cc
index 262185b93a920f544becd724ee725d12e85b2f37..05969cffad6fa28294388ea86afa820a2e225147 100644 (file)
--- a/lily/dynamic-performer.cc
+++ b/lily/dynamic-performer.cc
@@ -3,84 +3,70 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  2000 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2000--2006 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "performer.hh"
-#include "command-request.hh"
-#include "musical-request.hh"
+
 #include "audio-item.hh"
+#include "music.hh"
+#include "translator.icc"
 
 /*
   TODO:
-    handle multiple requests
- */
 
-/**
-   perform absolute (text) dynamics
- */
+  handle multiple events
+
+  perform absolute (text) dynamics
+*/
 class Dynamic_performer : public Performer
 {
 public:
-  VIRTUAL_COPY_CONS (Translator);
-  
-  Dynamic_performer ();
-  ~Dynamic_performer ();
-
+  TRANSLATOR_DECLARATIONS (Dynamic_performer);
 protected:
-  virtual bool do_try_music (Music* req_l);
-  void deprecated_process_music ();
-  virtual void do_pre_move_processing ();
-  virtual void process_acknowledged ();
+  virtual bool try_music (Music *event);
+  void stop_translation_timestep ();
+  void process_music ();
 
 private:
-  Music* script_req_l_;
-  Audio_dynamic* audio_p_;
+  Music *script_event_;
+  Audio_dynamic *audio_;
 };
 
-ADD_THIS_TRANSLATOR (Dynamic_performer);
-
 Dynamic_performer::Dynamic_performer ()
 {
-  script_req_l_ = 0;
-  audio_p_ = 0;
+  script_event_ = 0;
+  audio_ = 0;
 }
 
-Dynamic_performer::~Dynamic_performer ()
-{
-}
-
-
 void
-Dynamic_performer::deprecated_process_music ()
+Dynamic_performer::process_music ()
 {
-  if (script_req_l_)
+  if (script_event_)
     {
       SCM proc = get_property ("dynamicAbsoluteVolumeFunction");
 
-      SCM svolume  = SCM_EOL;
-      if (gh_procedure_p (proc))
+      SCM svolume = SCM_EOL;
+      if (ly_is_procedure (proc))
        {
          // urg
-         svolume = gh_call1 (proc, script_req_l_->get_mus_property ("text"));
+         svolume = scm_call_1 (proc, script_event_->get_property ("text"));
        }
 
-      Real volume = 0.5; 
-      if (gh_number_p (svolume))
-       volume = gh_scm2double (svolume);
+      Real volume = robust_scm2double (svolume, 0.5);
 
       /*
        properties override default equaliser setting
-       */
+      */
       SCM min = get_property ("midiMinimumVolume");
       SCM max = get_property ("midiMaximumVolume");
-      if (gh_number_p (min) || gh_number_p (max))
+      if (scm_is_number (min) || scm_is_number (max))
        {
          Interval iv (0, 1);
-         if (gh_number_p (min))
-           iv[MIN] = gh_scm2double (min);
-         if (gh_number_p (max))
-           iv[MAX] = gh_scm2double (max);
+         if (scm_is_number (min))
+           iv[MIN] = scm_to_double (min);
+         if (scm_is_number (max))
+           iv[MAX] = scm_to_double (max);
          volume = iv[MIN] + iv.length () * volume;
        }
       else
@@ -89,64 +75,58 @@ Dynamic_performer::deprecated_process_music ()
            urg, code duplication:: staff_performer
          */
          SCM s = get_property ("midiInstrument");
-         
-         if (!gh_string_p(s))
+
+         if (!scm_is_string (s))
            s = get_property ("instrument");
-         
-         if (!gh_string_p(s))
-           s = ly_str02scm ("piano");
-         
-         
+
+         if (!scm_is_string (s))
+           s = scm_makfrom0str ("piano");
+
          SCM eq = get_property ("instrumentEqualizer");
-         if (gh_procedure_p (eq))
-           {
-             s = gh_call1 (eq, s);
-           }
+         if (ly_is_procedure (eq))
+           s = scm_call_1 (eq, s);
 
-         if (gh_pair_p (s))
+         if (is_number_pair (s))
            {
-             Interval iv;
-             iv[MIN] = gh_scm2double (gh_car (s));
-             iv[MAX] = gh_scm2double (gh_cdr (s));
+             Interval iv = ly_scm2interval (s);
              volume = iv[MIN] + iv.length () * volume;
            }
        }
-      
-      audio_p_ = new Audio_dynamic (volume);
-      Audio_element_info info (audio_p_, script_req_l_);
+
+      audio_ = new Audio_dynamic (volume);
+      Audio_element_info info (audio_, script_event_);
       announce_element (info);
-      script_req_l_ = 0;
+      script_event_ = 0;
     }
 }
 
 void
-Dynamic_performer::process_acknowledged ()
-{
-  deprecated_process_music ();
-}
-
-void
-Dynamic_performer::do_pre_move_processing ()
+Dynamic_performer::stop_translation_timestep ()
 {
-  if (audio_p_)
+  if (audio_)
     {
-      play_element (audio_p_);
-      audio_p_ = 0;
+      play_element (audio_);
+      audio_ = 0;
     }
 }
 
 bool
-Dynamic_performer::do_try_music (Music* r)
+Dynamic_performer::try_music (Music *r)
 {
-  if (!script_req_l_)
+  if (!script_event_)
     {
-      if( dynamic_cast <Text_script_req*> (r)
-         && r->get_mus_property ("text-type") == ly_symbol2scm ("dynamic"))
+      if (r->is_mus_type ("absolute-dynamic-event")) // fixme.
        {
-         script_req_l_ = r;
+         script_event_ = r;
          return true;
        }
     }
   return false;
 }
 
+ADD_TRANSLATOR (Dynamic_performer,
+               /* doc */                "",
+               /* create */ "",
+               /* accept */ "absolute-dynamic-event",
+               /* read */ "dynamicAbsoluteVolumeFunction midiMaximumVolume midiMinimumVolume midiInstrument instrumentEqualizer",
+               /*writes*/"");