(ly_module_define): only define variable if

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

diff --git a/lily/note-performer.cc b/lily/note-performer.cc
index 5ba558cfc70c74b1859c007ac0bc68bc597484c6..4d938dee650282bf227b8eb9e525f385b28ab7d2 100644 (file)
--- a/lily/note-performer.cc
+++ b/lily/note-performer.cc
@@ -3,14 +3,14 @@
 
   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 +18,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,20 +37,20 @@ 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"));
+         SCM pit =  n->get_property ("pitch");
 
-         if (pit)
+         if (Pitch * pitp = unsmob_pitch (pit))
            {
-             Audio_note* p = new Audio_note (*pit,  n->get_length (), transposing_i);
+             Audio_note* p = new Audio_note (*pitp,  n->get_length (), transposing);
              Audio_element_info info (p, n);
              announce_element (info);
              notes_.push (p);
@@ -61,29 +60,13 @@ Note_performer::create_audio_elements ()
     }
 }
 
-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];
@@ -132,9 +115,9 @@ Note_performer::try_music (Music* ev)
   return false;
 }
 
-ENTER_DESCRIPTION(Note_performer,"","",
+ENTER_DESCRIPTION (Note_performer,"","",
                  "note-event busy-playing-event","","","");
 
-Note_performer::Note_performer()
+Note_performer::Note_performer ()
 {
 }