X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fdynamic-performer.cc;h=53e8a5e0d4392475d8a26eb9c49b0a4dbe4da1d7;hb=e7020dbb36a9e9c10bda48e5197213e8a3bacef6;hp=7fbca0dd698718d599a2dca4e009e224a2ed94bf;hpb=ee513a2f7d18fc8d43e1c291350ed81856b0192d;p=lilypond.git

diff --git a/lily/dynamic-performer.cc b/lily/dynamic-performer.cc
index 7fbca0dd69..53e8a5e0d4 100644
--- a/lily/dynamic-performer.cc
+++ b/lily/dynamic-performer.cc
@@ -3,110 +3,133 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  2000 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2000--2004 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "performer.hh"
-#include "command-request.hh"
-#include "musical-request.hh"
+
+#include "event.hh"
 #include "audio-item.hh"
 
 /*
   TODO:
-    handle multiple requests
-    handle span requests (crescendo/decrescendo)
- */
+  
+    handle multiple events
 
-/**
-   perform absolute (text) dynamics
+    perform absolute (text) dynamics
  */
 class Dynamic_performer : public Performer
 {
 public:
-  VIRTUAL_COPY_CONS (Translator);
-  
-  Dynamic_performer ();
-  ~Dynamic_performer ();
-
+  TRANSLATOR_DECLARATIONS (Dynamic_performer);
 protected:
-  void do_print () const;
-  virtual bool do_try_music (Music* req_l);
-  virtual void do_process_music ();
-  virtual void do_pre_move_processing ();
+  virtual bool try_music (Music* req);
+  virtual void stop_translation_timestep ();
+  virtual void create_audio_elements ();
 
 private:
-  Text_script_req* text_script_req_l_;
-  Audio_dynamic* audio_p_;
+  Music* script_req_;
+  Audio_dynamic* audio_;
 };
 
-ADD_THIS_TRANSLATOR (Dynamic_performer);
-
 Dynamic_performer::Dynamic_performer ()
 {
-  text_script_req_l_ = 0;
-  audio_p_ = 0;
-}
-
-Dynamic_performer::~Dynamic_performer ()
-{
+  script_req_ = 0;
+  audio_ = 0;
 }
 
 void
-Dynamic_performer::do_print () const
+Dynamic_performer::create_audio_elements ()
 {
-#ifndef NPRINT
-  if (text_script_req_l_)
-    text_script_req_l_->print ();
-#endif
-}
-
-void
-Dynamic_performer::do_process_music ()
-{
-  if (text_script_req_l_)
+  if (script_req_)
     {
+      SCM proc = get_property ("dynamicAbsoluteVolumeFunction");
+
+      SCM svolume  = SCM_EOL;
+      if (ly_c_procedure_p (proc))
+	{
+	  // urg
+	  svolume = scm_call_1 (proc, script_req_->get_property ("text"));
+	}
+
+      Real volume = robust_scm2double (svolume, 0.5); 
+
+      /*
+	properties override default equaliser setting
+       */
+      SCM min = get_property ("midiMinimumVolume");
+      SCM max = get_property ("midiMaximumVolume");
+      if (is_number (min) || is_number (max))
+	{
+	  Interval iv (0, 1);
+	  if (is_number (min))
+	    iv[MIN] = ly_scm2double (min);
+	  if (is_number (max))
+	    iv[MAX] = ly_scm2double (max);
+	  volume = iv[MIN] + iv.length () * volume;
+	}
+      else
+	{
+	  /*
+	    urg, code duplication:: staff_performer
+	  */
+	  SCM s = get_property ("midiInstrument");
+	  
+	  if (!ly_c_string_p (s))
+	    s = get_property ("instrument");
+	  
+	  if (!ly_c_string_p (s))
+	    s = scm_makfrom0str ("piano");
+	  
+	  
+	  SCM eq = get_property ("instrumentEqualizer");
+	  if (ly_c_procedure_p (eq))
+	    {
+	      s = scm_call_1 (eq, s);
+	    }
+
+	  if (is_number_pair (s))
+	    {
+	      Interval iv = ly_scm2interval (s);
+	      volume = iv[MIN] + iv.length () * volume;
+	    }
+	}
       
-      SCM s = scm_eval
-	(gh_list
-	 (ly_symbol2scm ("dynamic-absolute-volume"),
-	  ly_quote_scm (ly_str02scm (text_script_req_l_->text_str_.ch_C ())),
-	  SCM_UNDEFINED));
-      int volume = gh_scm2int (ly_eval_str ("dynamic-default-volume"));
-      if (gh_number_p (s))
-	volume = gh_scm2int (s);
-
-      audio_p_ = new Audio_dynamic (volume);
-      Audio_element_info info (audio_p_, text_script_req_l_);
+      audio_ = new Audio_dynamic (volume);
+      Audio_element_info info (audio_, script_req_);
       announce_element (info);
-      text_script_req_l_ = 0;
+      script_req_ = 0;
     }
 }
 
 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 (!text_script_req_l_)
+  if (!script_req_)
     {
-      // urg, text script, style `dynamic' is how absolute dynamics appear
-      if(Text_script_req* t = dynamic_cast <Text_script_req*> (r))
+      if (r->is_mus_type ("absolute-dynamic-event")) // fixme.
 	{
-	  if (t->style_str_ == "dynamic")
-	    {
-	      text_script_req_l_ = t;
-	      return true;
-	    }
+	  script_req_ = r;
+	  return true;
 	}
     }
   return false;
 }
 
+ENTER_DESCRIPTION (Dynamic_performer,
+		  /*descr*/		  "",
+		  /* creats*/ "",
+		  /* accepts */     "absolute-dynamic-event",
+		  /* acks */ "",
+		  /*reads */"dynamicAbsoluteVolumeFunction midiMaximumVolume midiMinimumVolume midiInstrument instrumentEqualizer",
+		  /*writes*/"");