Merge branch 'master' of git://git.sv.gnu.org/lilypond

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

diff --git a/lily/drum-note-performer.cc b/lily/drum-note-performer.cc
index 2926fb8961279339ac29f3c1e9e1ba89e38082c3..49a8d270018a4b08cc5c80916b7a05769b0a3395 100644 (file)
--- a/lily/drum-note-performer.cc
+++ b/lily/drum-note-performer.cc
@@ -10,8 +10,6 @@
 #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"
@@ -53,21 +51,21 @@ 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);
+                                          tie_event, Pitch (0, 0, 0));
          Audio_element_info info (p, n);
          announce_element (info);
          notes_.push_back (p);
@@ -92,5 +90,4 @@ Drum_note_performer::listen_note (Stream_event *ev)
 }
 
 ADD_TRANSLATOR (Drum_note_performer,
-               "Play drum notes.", "",
-               "note-event", "", "");
+               "Play drum notes.", "", "", "");