X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fdrum-note-performer.cc;h=94c2d55ea319b0edc6c3e6730a706f323095ffc4;hb=ee5f21d7ed3b985913194699aa1d412e4bced562;hp=91295bfd54c9a5c29867555cc5b729131c6dcee0;hpb=b7a0cffbf9d1069860368f289a5b50e9d1d90ba8;p=lilypond.git diff --git a/lily/drum-note-performer.cc b/lily/drum-note-performer.cc index 91295bfd54..94c2d55ea3 100644 --- a/lily/drum-note-performer.cc +++ b/lily/drum-note-performer.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 1996--2009 Jan Nieuwenhuizen + Copyright (C) 1996--2012 Jan Nieuwenhuizen LilyPond is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -35,8 +35,7 @@ protected: void process_music (); DECLARE_TRANSLATOR_LISTENER (note); private: - vector note_evs_; - vector notes_; + vector note_evs_; }; Drum_note_performer::Drum_note_performer () @@ -56,11 +55,11 @@ Drum_note_performer::process_music () SCM defn = SCM_EOL; if (scm_is_symbol (sym) - && (scm_hash_table_p (tab) == SCM_BOOL_T)) - defn = scm_hashq_ref (tab, sym, SCM_EOL); + && (scm_hash_table_p (tab) == SCM_BOOL_T)) + defn = scm_hashq_ref (tab, sym, SCM_EOL); if (Pitch *pit = unsmob_pitch (defn)) - { + { SCM articulations = n->get_property ("articulations"); Stream_event *tie_event = 0; for (SCM s = articulations; @@ -70,19 +69,18 @@ Drum_note_performer::process_music () 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 ()); + Moment len = get_event_length (n, now_mom ()); - Audio_note *p = new Audio_note (*pit, len, + 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); - } + Audio_element_info info (p, n); + announce_element (info); + } } note_evs_.clear (); @@ -91,7 +89,6 @@ Drum_note_performer::process_music () void Drum_note_performer::stop_translation_timestep () { - notes_.clear (); note_evs_.clear (); } @@ -103,15 +100,15 @@ Drum_note_performer::listen_note (Stream_event *ev) } ADD_TRANSLATOR (Drum_note_performer, - /* doc */ - "Play drum notes.", + /* doc */ + "Play drum notes.", - /* create */ - "", + /* create */ + "", - /* read */ - "", + /* read */ + "", - /* write */ - "" - ); + /* write */ + "" + );