From 21f247ee3fb6237f1059280cb0a9a3aed9bbe86b Mon Sep 17 00:00:00 2001 From: fred Date: Thu, 18 Mar 1999 14:11:12 +0000 Subject: [PATCH] lilypond-1.1.36 --- NEWS | 12 ++++++++++++ lily/include/note-performer.hh | 3 ++- lily/note-performer.cc | 18 +++++++----------- 3 files changed, 21 insertions(+), 12 deletions(-) diff --git a/NEWS b/NEWS index c750a49d46..ab43ab8884 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,15 @@ +pl 35.uu1 + - more memory tweaks: don't do Score_element::line_l () when deleting lines. + - more generic properties. + - change ridic. dims assert into warning. + - tex/ midi fixes (thanks, Mats). + - bf: don't crash when no Stem_infos are set. + - extender-spanner simplification + - working MIDI chords (Thanks Dscho) + +pl 35.jcn1 + - some ps fixes + pl 35 pl 34.hwn2 diff --git a/lily/include/note-performer.hh b/lily/include/note-performer.hh index 1a6c53bd5f..194365af89 100644 --- a/lily/include/note-performer.hh +++ b/lily/include/note-performer.hh @@ -9,6 +9,7 @@ #define NOTE_PERFORMER_HH #include "performer.hh" +#include "list.hh" /** */ @@ -27,7 +28,7 @@ protected: virtual void do_print() const; private: - Melodic_req * note_req_l_; + Array note_req_l_; }; #endif // NOTE_PERFORMER_HH diff --git a/lily/note-performer.cc b/lily/note-performer.cc index 0903207d9e..a96439a928 100644 --- a/lily/note-performer.cc +++ b/lily/note-performer.cc @@ -16,22 +16,22 @@ ADD_THIS_TRANSLATOR (Note_performer); Note_performer::Note_performer () { - note_req_l_ = 0; } void Note_performer::do_print () const { #ifndef NPRINT - if (note_req_l_) - note_req_l_->print (); + if (note_req_l_.size()>0) + for(int i=0;iprint (); #endif } void Note_performer::do_process_requests () { - if (note_req_l_) + if (note_req_l_.size()>0) { int transposing_i = 0; //urg @@ -39,22 +39,18 @@ Note_performer::do_process_requests () if (!prop.empty_b () && prop.isnum_b ()) transposing_i = prop; + while(note_req_l_.size()>0) + play (new Audio_note (note_req_l_.pop(), transposing_i)); - play (new Audio_note (note_req_l_, transposing_i)); - - note_req_l_ = 0; } } bool Note_performer::do_try_music (Music* req_l) { - if (note_req_l_) - return false; - if (Note_req *nr = dynamic_cast (req_l)) { - note_req_l_ = nr; + note_req_l_.push(nr); return true; } return false; -- 2.11.4.GIT