X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-performer.cc;h=6bfc82211b73724e7104fa121558bfb903b06776;hb=a089ffb45c3473bfdb95edcf351544775dad547e;hp=ae8b1adf17cefc37fd5ec515c573546b053850d6;hpb=6b9bfd374643d1eed1ea158777d796c57a2bcd3a;p=lilypond.git

diff --git a/lily/note-performer.cc b/lily/note-performer.cc
index ae8b1adf17..6bfc82211b 100644
--- a/lily/note-performer.cc
+++ b/lily/note-performer.cc
@@ -3,130 +3,98 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2002 Jan Nieuwenhuizen <janneke@gnu.org>
- */
+  (c) 1996--2006 Jan Nieuwenhuizen <janneke@gnu.org>
+*/
 
 #include "performer.hh"
-#include "musical-request.hh"
 #include "audio-item.hh"
 #include "audio-column.hh"
-#include "global-translator.hh"
+#include "global-context.hh"
+#include "stream-event.hh"
 #include "warn.hh"
 
+#include "translator.icc"
+
 /**
-Convert reqs to audio notes.
+   Convert evs to audio notes.
 */
-class Note_performer : public Performer {
+class Note_performer : public Performer
+{
 public:
-  TRANSLATOR_DECLARATIONS(Note_performer);
-  
-protected:
-  virtual bool try_music (Music *req) ;
+  TRANSLATOR_DECLARATIONS (Note_performer);
 
-  virtual void stop_translation_timestep ();
-  virtual void create_audio_elements ();
-  Global_translator* get_global_translator ();
+protected:
+  void stop_translation_timestep ();
+  void process_music ();
 
+  DECLARE_TRANSLATOR_LISTENER (note);
 private:
-  Array<Note_req*> note_reqs_;
-  Array<Audio_note*> notes_;
-  Array<Audio_note*> delayeds_;
+  vector<Stream_event*> note_evs_;
+  vector<Audio_note*> notes_;
 };
 
-void 
-Note_performer::create_audio_elements ()
+void
+Note_performer::process_music ()
 {
-  if (note_reqs_.size ())
+  if (note_evs_.size ())
     {
-      int transposing_i = 0;
-      //urg
-      SCM prop = get_property ("transposing");
-      if (gh_number_p (prop)) 
-	transposing_i = gh_scm2int (prop);
+      Pitch transposing;
+      SCM prop = get_property ("instrumentTransposition");
+      if (unsmob_pitch (prop))
+	transposing = *unsmob_pitch (prop);
 
-      while (note_reqs_.size ())
+      while (note_evs_.size ())
 	{
-	  Note_req* n = note_reqs_.pop ();
-	  Pitch pit =  * unsmob_pitch (n->get_mus_property ("pitch"));
-	  Audio_note* p = new Audio_note (pit,  n->length_mom (), transposing_i);
-	  Audio_element_info info (p, n);
-	  announce_element (info);
-	  notes_.push (p);
+	  Stream_event *n = note_evs_.back ();
+	  note_evs_.pop_back ();
+	  SCM pit = n->get_property ("pitch");
+
+	  if (Pitch *pitp = unsmob_pitch (pit))
+	    {
+              SCM articulations = n->get_property ("articulations");
+              Stream_event *tie_event = 0;
+              for (SCM s = articulations;
+                   !tie_event && scm_is_pair (s);
+                   s = scm_cdr (s))
+                {
+                  Stream_event *ev = unsmob_stream_event (scm_car (s));
+                  if (!ev)
+                    continue;
+	  
+                  if (ev->in_event_class ("tie-event"))
+                    tie_event = ev;
+                }
+
+	      Audio_note *p = new Audio_note (*pitp, get_event_length (n), 
+                                              tie_event, transposing.negated ());
+	      Audio_element_info info (p, n);
+	      announce_element (info);
+	      notes_.push_back (p);
+	    }
 	}
-      note_reqs_.clear ();
+      note_evs_.clear ();
     }
 }
 
-Global_translator*
-Note_performer::get_global_translator ()
-{
-  Translator *t = this;
-  Global_translator *global =0;
-  do
-    {
-      t = t->daddy_trans_ ;
-      global = dynamic_cast<Global_translator*> (t);
-    }
-  while (!global);
-
-  return global;
-}
-
-
 void
 Note_performer::stop_translation_timestep ()
 {
-
   // why don't grace notes show up here?
   // --> grace notes effectively do not get delayed
-  Global_translator* global = get_global_translator ();
-  for (int i=0; i < notes_.size (); i++)
-    {
-      Audio_note* n = notes_[i];
-      Moment m= n->delayed_until_mom_;
-      if (m.to_bool ())
-	{
-	  global->add_moment_to_process (m);
-	  delayeds_.push (n);
-	  notes_[i] = 0;
-	  notes_.del (i);
-	  i--;
-	}
-    }
-
-  Moment now = now_mom ();
-  for (int i=0; i < notes_.size (); i++)
-    {
-      play_element (notes_[i]);
-    }
   notes_.clear ();
-  note_reqs_.clear ();
-  for (int i=0; i < delayeds_.size (); i++)
-    {
-      Audio_note* n = delayeds_[i];
-      if (n->delayed_until_mom_ <= now)
-	{
-	  play_element (n);
-	  delayeds_[i] = 0;
-	  delayeds_.del (i);
-	  i--;
-	}
-    }
+  note_evs_.clear ();
 }
- 
-bool
-Note_performer::try_music (Music* req)
+
+IMPLEMENT_TRANSLATOR_LISTENER (Note_performer, note)
+void
+Note_performer::listen_note (Stream_event *ev)
 {
-  if (Note_req *nr = dynamic_cast <Note_req *> (req))
-    {
-      note_reqs_.push (nr);
-      return true;
-    }
-  return false;
+  note_evs_.push_back (ev);
 }
 
-ENTER_DESCRIPTION(Note_performer,"","","general-music","","","");
+ADD_TRANSLATOR (Note_performer, "", "",
+		"", "");
 
-Note_performer::Note_performer()
+Note_performer::Note_performer ()
 {
 }