* lily/sequential-music.cc: remove file.

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

diff --git a/lily/note-performer.cc b/lily/note-performer.cc
index eb950c42c7d525c6f6cfc50cff89d13af71a7a88..e9a567b6257975e661b42000837fc1fb350027fe 100644 (file)
--- a/lily/note-performer.cc
+++ b/lily/note-performer.cc
@@ -3,14 +3,13 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2003 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1996--2004 Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
 #include "performer.hh"
-#include "event.hh"
 #include "audio-item.hh"
 #include "audio-column.hh"
-#include "global-translator.hh"
+#include "global-context.hh"
 #include "warn.hh"
 
 /**
@@ -18,15 +17,14 @@ 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 *ev) ;
 
   virtual void stop_translation_timestep ();
   virtual void create_audio_elements ();
-  Global_translator* get_global_translator ();
-
+ 
 private:
   Link_array<Music> note_evs_;
   Link_array<Audio_note> notes_;
@@ -38,52 +36,40 @@ Note_performer::create_audio_elements ()
 {
   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_evs_.size ())
        {
          Music* n = note_evs_.pop ();
-         Pitch pit =  * unsmob_pitch (n->get_mus_property ("pitch"));
-         Audio_note* p = new Audio_note (pit,  n->get_length (), transposing_i);
-         Audio_element_info info (p, n);
-         announce_element (info);
-         notes_.push (p);
+         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_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++)
+  Global_context * global = get_global_context ();
+  for (int i = 0; i < notes_.size (); i++)
     {
       Audio_note* n = notes_[i];
-      Moment m= n->delayed_until_mom_;
+      Moment m = n->delayed_until_mom_;
       if (m.to_bool ())
        {
          global->add_moment_to_process (m);
@@ -95,13 +81,13 @@ Note_performer::stop_translation_timestep ()
     }
 
   Moment now = now_mom ();
-  for (int i=0; i < notes_.size (); i++)
+  for (int i = 0; i < notes_.size (); i++)
     {
       play_element (notes_[i]);
     }
   notes_.clear ();
   note_evs_.clear ();
-  for (int i=0; i < delayeds_.size (); i++)
+  for (int i = 0; i < delayeds_.size (); i++)
     {
       Audio_note* n = delayeds_[i];
       if (n->delayed_until_mom_ <= now)
@@ -128,9 +114,9 @@ Note_performer::try_music (Music* ev)
   return false;
 }
 
-ENTER_DESCRIPTION(Note_performer,"","",
+ADD_TRANSLATOR (Note_performer,"","",
                  "note-event busy-playing-event","","","");
 
-Note_performer::Note_performer()
+Note_performer::Note_performer ()
 {
 }