Imported Upstream version 2.14.2

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

diff --git a/lily/drum-note-performer.cc b/lily/drum-note-performer.cc
index 2926fb8961279339ac29f3c1e9e1ba89e38082c3..b28a7cd9ec1bf6dea157c0a3fee81c74169fba0f 100644 (file)
--- a/lily/drum-note-performer.cc
+++ b/lily/drum-note-performer.cc
@@ -1,17 +1,26 @@
 /*
-  note-performer.cc -- implement Drum_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--2006 Jan Nieuwenhuizen <janneke@gnu.org>
+  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.
+
+  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 "audio-column.hh"
 #include "global-context.hh"
-#include "music.hh"
-#include "pitch.hh"
 #include "stream-event.hh"
 #include "translator.icc"
 #include "warn.hh"
@@ -26,8 +35,7 @@ protected:
   void process_music ();
   DECLARE_TRANSLATOR_LISTENER (note);
 private:
-  vector<Stream_event*> note_evs_;
-  vector<Audio_note*> notes_;
+  vector<Stream_event *> note_evs_;
 };
 
 Drum_note_performer::Drum_note_performer ()
@@ -53,24 +61,25 @@ Drum_note_performer::process_music ()
       if (Pitch *pit = unsmob_pitch (defn))
        {
           SCM articulations = n->get_property ("articulations");
-          Music *tie_event = 0;
+          Stream_event *tie_event = 0;
           for (SCM s = articulations;
                !tie_event && scm_is_pair (s);
                s = scm_cdr (s))
             {
-              Music *m = unsmob_music (scm_car (s));
-              if (!m)
+              Stream_event *ev = unsmob_stream_event (scm_car (s));
+              if (!ev)
                 continue;
          
-              if (m->is_mus_type ("tie-event"))
-                tie_event = m;
+              if (ev->in_event_class ("tie-event"))
+                tie_event = ev;
             }
 
-         Audio_note *p = new Audio_note (*pit, get_event_length (n), 
-                                          tie_event, 0);
+         Moment len = get_event_length (n, now_mom ());
+
+         Audio_note *p = new Audio_note (*pit, len,
+                                          tie_event, Pitch (0, 0, 0));
          Audio_element_info info (p, n);
          announce_element (info);
-         notes_.push_back (p);
        }
     }
 
@@ -80,7 +89,6 @@ Drum_note_performer::process_music ()
 void
 Drum_note_performer::stop_translation_timestep ()
 {
-  notes_.clear ();
   note_evs_.clear ();
 }
 
@@ -92,5 +100,15 @@ Drum_note_performer::listen_note (Stream_event *ev)
 }
 
 ADD_TRANSLATOR (Drum_note_performer,
-               "Play drum notes.", "",
-               "note-event", "", "");
+               /* doc */
+               "Play drum notes.",
+
+               /* create */
+               "",
+
+               /* read */
+               "",
+
+               /* write */
+               ""
+               );