Fix out-of-build compile for ja.

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

diff --git a/lily/note-performer.cc b/lily/note-performer.cc
index be234fcdd11d0ae6e0e9907d47c90513289fda2d..0a9f79f08a378ef8a325ca6b21c26b8e0ea88ecb 100644 (file)
--- a/lily/note-performer.cc
+++ b/lily/note-performer.cc
@@ -3,75 +3,128 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996, 1997 Jan Nieuwenhuizen <jan@digicash.com>
- */
+  (c) 1996--2009 Jan Nieuwenhuizen <janneke@gnu.org>
+*/
 
-#include "note-performer.hh"
-#include "translator.hh"
-#include "input-translator.hh"
-#include "musical-request.hh"
+#include "performer.hh"
 #include "audio-item.hh"
-#include "debug.hh"
+#include "audio-column.hh"
+#include "global-context.hh"
+#include "stream-event.hh"
+#include "warn.hh"
 
-IMPLEMENT_IS_TYPE_B1(Note_performer,Performer);
+#include "translator.icc"
 
-ADD_THIS_PERFORMER(Note_performer);
-
-Note_performer::Note_performer()
+class Note_performer : public Performer
 {
-    note_req_l_ = 0;
-    off_mom_ = 0;
-}
+public:
+  TRANSLATOR_DECLARATIONS (Note_performer);
+
+protected:
+  void stop_translation_timestep ();
+  void process_music ();
+
+  DECLARE_TRANSLATOR_LISTENER (note);
+private:
+  vector<Stream_event*> note_evs_;
+  vector<Audio_note*> notes_;
+
 
-Note_performer::~Note_performer()
+  vector<Audio_note*> last_notes_;
+  Moment last_start_;
+  
+};
+
+void
+Note_performer::process_music ()
 {
+  if (!note_evs_.size ())
+    return;
+
+  Pitch transposing;
+  SCM prop = get_property ("instrumentTransposition");
+  if (unsmob_pitch (prop))
+    transposing = *unsmob_pitch (prop);
+
+  for (vsize i = 0; i < note_evs_.size (); i ++)
+    {
+      Stream_event *n = note_evs_[i];
+      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;
+           }
+
+         Moment len = get_event_length (n, now_mom ());
+         
+         Audio_note *p = new Audio_note (*pitp, len, 
+                                         tie_event, transposing.negated ());
+         Audio_element_info info (p, n);
+         announce_element (info);
+         notes_.push_back (p);
+
+         /*
+           shorten previous note.
+          */
+         if (now_mom ().grace_part_)
+           {
+             if (last_start_.grace_part_ == Rational (0))
+               {
+                 for (vsize i = 0; i < last_notes_.size (); i++)
+                   last_notes_[i]->length_mom_ += Moment (0,
+                                                          now_mom().grace_part_);
+               }
+           }
+       }
+    }
 }
 
-void 
-Note_performer::do_print() const
+void
+Note_performer::stop_translation_timestep ()
 {
-#ifndef NPRINT
-    if ( note_req_l_ ) {
-       note_req_l_->print();
-       mtor << ( off_mom_ ? "on" : "off" ) << "\n";
+  if (note_evs_.size ())
+    {
+      last_notes_ = notes_;
+      last_start_ = now_mom ();
     }
-#endif
+
+  notes_.clear ();
+  note_evs_.clear ();
 }
 
-void 
-Note_performer::process_requests() 
+IMPLEMENT_TRANSLATOR_LISTENER (Note_performer, note)
+void
+Note_performer::listen_note (Stream_event *ev)
 {
-    // this is _really_ braindead, but it generates some output
-    if ( !note_req_l_ || !note_req_l_->melodic()  || !note_req_l_->rhythmic() )
-       return;
-
-    // ugh! Midi specific
-    Moment mom = get_mom();
-    if ( !off_mom_ ) { // start note
-       off_mom_ = mom + note_req_l_->duration();
-       play( new Audio_note( note_req_l_, true ) );
-    }
-    else if ( mom == off_mom_ ) { // stop note
-       play( new Audio_note( note_req_l_, false ) );
-       note_req_l_ = 0;
-       off_mom_ = 0;
-    }
+  note_evs_.push_back (ev);
 }
 
-bool 
-Note_performer::do_try_request( Request* req_l )
+ADD_TRANSLATOR (Note_performer,
+               /* doc */
+               "",
+
+               /* create */
+               "",
+
+               /* read */
+               "",
+
+               /* write */
+               ""
+               );
+
+Note_performer::Note_performer ()
 {
-    if ( note_req_l_ )
-       return false;
-    
- // huh?
-//    if (req_l->musical() && (req_l->musical()->note() || req_l->musical()->rest()))
-//     note_req_l_ = req_l->musical()->rhythmic();
-    if ( req_l->musical() && req_l->musical()->note() )
-// huh?
-       note_req_l_ = req_l->musical()->melodic();
-    else
-       return false;
-
-    return true;
 }