X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=inline;f=lily%2Fnote-performer.cc;h=0109b7bb33b36717b5737ddefccf86eed72cbdec;hb=f4ff2e488239d66830ac8b3ae5771358a917b58f;hp=91509a9734c20d7d8861ce74d629802326084ab2;hpb=0a8f98072c53d877cbb53dd490ba4394d03fa8d2;p=lilypond.git

diff --git a/lily/note-performer.cc b/lily/note-performer.cc
index 91509a9734..0109b7bb33 100644
--- a/lily/note-performer.cc
+++ b/lily/note-performer.cc
@@ -3,32 +3,31 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2002 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1996--2004 Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
 #include "performer.hh"
-#include "musical-request.hh"
+#include "event.hh"
 #include "audio-item.hh"
 #include "audio-column.hh"
-#include "global-translator.hh"
+#include "global-context.hh"
 #include "warn.hh"
 
 /**
-Convert reqs to audio notes.
+Convert evs to audio notes.
 */
 class Note_performer : public Performer {
 public:
-  TRANSLATOR_DECLARATIONS(Note_performer);
+  TRANSLATOR_DECLARATIONS (Note_performer);
   
 protected:
-  virtual bool try_music (Music *req) ;
+  virtual bool try_music (Music *ev) ;
 
   virtual void stop_translation_timestep ();
   virtual void create_audio_elements ();
-  Global_translator* get_global_translator ();
-
+ 
 private:
-  Link_array<Music> note_reqs_;
+  Link_array<Music> note_evs_;
   Link_array<Audio_note> notes_;
   Link_array<Audio_note> delayeds_;
 };
@@ -36,50 +35,38 @@ private:
 void 
 Note_performer::create_audio_elements ()
 {
-  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);
+      int transposing = 0;
+
+      SCM prop = get_property ("instrumentTransposition");
+      if (unsmob_pitch (prop)) 
+	transposing = unsmob_pitch (prop)->semitone_pitch ();
 
-      while (note_reqs_.size ())
+      while (note_evs_.size ())
 	{
-	  Music* 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);
+	  Music* n = note_evs_.pop ();
+	  SCM pit =  n->get_property ("pitch");
+
+	  if (Pitch * pitp = unsmob_pitch (pit))
+	    {
+	      Audio_note* p = new Audio_note (*pitp,  n->get_length (),  - transposing);
+	      Audio_element_info info (p, n);
+	      announce_element (info);
+	      notes_.push (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 ();
+  Global_context * global = get_global_context ();
   for (int i=0; i < notes_.size (); i++)
     {
       Audio_note* n = notes_[i];
@@ -100,7 +87,7 @@ Note_performer::stop_translation_timestep ()
       play_element (notes_[i]);
     }
   notes_.clear ();
-  note_reqs_.clear ();
+  note_evs_.clear ();
   for (int i=0; i < delayeds_.size (); i++)
     {
       Audio_note* n = delayeds_[i];
@@ -115,18 +102,22 @@ Note_performer::stop_translation_timestep ()
 }
  
 bool
-Note_performer::try_music (Music* req)
+Note_performer::try_music (Music* ev)
 {
-  if (req->is_mus_type ("note-event"))
+  if (ev->is_mus_type ("note-event"))
     {
-      note_reqs_.push (req);
+      note_evs_.push (ev);
       return true;
     }
+  else if (ev->is_mus_type ("busy-playing-event"))
+    return note_evs_.size ();
+  
   return false;
 }
 
-ENTER_DESCRIPTION(Note_performer,"","","general-music","","","");
+ENTER_DESCRIPTION (Note_performer,"","",
+		  "note-event busy-playing-event","","","");
 
-Note_performer::Note_performer()
+Note_performer::Note_performer ()
 {
 }