resolve merge

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

diff --git a/lily/drum-note-performer.cc b/lily/drum-note-performer.cc
index ee445f5ad89aac3d14db3c510a1e47e2e8adc206..b28a7cd9ec1bf6dea157c0a3fee81c74169fba0f 100644 (file)
--- a/lily/drum-note-performer.cc
+++ b/lily/drum-note-performer.cc
@@ -1,9 +1,20 @@
 /*
-  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--2009 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"
@@ -24,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 ()
@@ -70,7 +80,6 @@ Drum_note_performer::process_music ()
                                           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 ();
 }