X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-performer.cc;h=ce5c822fb43140b208c4b49d2a0ab98f99faa4f7;hb=428508010fb07aa62249470e7d6f4dcb4db11541;hp=dd2ac9da14b8d063210cf06fc7975565e4265a33;hpb=13e79c0250d34b6bdfbafbc551ef64e8b59b2991;p=lilypond.git

diff --git a/lily/note-performer.cc b/lily/note-performer.cc
index dd2ac9da14..ce5c822fb4 100644
--- a/lily/note-performer.cc
+++ b/lily/note-performer.cc
@@ -1,58 +1,140 @@
 /*
-  note-performer.cc -- implement Note_performer
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1996--2011 Jan Nieuwenhuizen <janneke@gnu.org>
 
-  (c) 1996, 1997 Jan Nieuwenhuizen <jan@digicash.com>
- */
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
 
-#include "note-performer.hh"
-#include "translator.hh"
-#include "input-translator.hh"
-#include "musical-request.hh"
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#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"
+
+#include "translator.icc"
+
+class Note_performer : public Performer
+{
+public:
+  TRANSLATOR_DECLARATIONS (Note_performer);
+
+protected:
+  void stop_translation_timestep ();
+  void process_music ();
 
-IMPLEMENT_IS_TYPE_B1(Note_performer,Performer);
+  DECLARE_TRANSLATOR_LISTENER (note);
+private:
+  vector<Stream_event *> note_evs_;
+  vector<Audio_note *> notes_;
 
-ADD_THIS_PERFORMER(Note_performer);
+  vector<Audio_note *> last_notes_;
+  Moment last_start_;
 
-Note_performer::Note_performer()
+};
+
+void
+Note_performer::process_music ()
 {
-  note_req_l_ = 0;
+  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_) 
+  if (note_evs_.size ())
     {
-  	note_req_l_->print();
+      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;
-
-  play (new Audio_note (note_req_l_) );
-  note_req_l_ = 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;
-  
-  if ( !req_l->musical() || !req_l->musical ()->note ())
-	return false;
-
-  note_req_l_ = req_l->musical()->melodic ();
-  return true;
 }