Index: lily/drum-note-performer.cc =================================================================== RCS file: /cvsroot/lilypond/lilypond/lily/drum-note-performer.cc,v retrieving revision 1.15 diff -u -p -u -r1.15 drum-note-performer.cc --- lily/drum-note-performer.cc 4 Feb 2005 12:35:32 -0000 1.15 +++ lily/drum-note-performer.cc 6 Feb 2005 10:10:01 -0000 @@ -24,7 +24,6 @@ protected: private: Link_array note_evs_; Link_array notes_; - Link_array delayeds_; }; void @@ -60,21 +59,6 @@ Drum_note_performer::stop_translation_ti { // why don't grace notes show up here? // --> grace notes effectively do not get delayed - Global_context * global = get_global_context (); - for (int i = 0; i < notes_.size (); i++) - { - Audio_note* n = notes_[i]; - Moment m = n->delayed_until_mom_; - if (m.to_bool ()) - { - global->add_moment_to_process (m); - delayeds_.push (n); - notes_[i] = 0; - notes_.del (i); - i--; - } - } - Moment now = now_mom (); for (int i = 0; i < notes_.size (); i++) { @@ -82,17 +66,6 @@ Drum_note_performer::stop_translation_ti } notes_.clear (); note_evs_.clear (); - for (int i = 0; i < delayeds_.size (); i++) - { - Audio_note* n = delayeds_[i]; - if (n->delayed_until_mom_ <= now) - { - play_element (n); - delayeds_[i] = 0; - delayeds_.del (i); - i--; - } - } } bool Index: lily/note-performer.cc =================================================================== RCS file: /cvsroot/lilypond/lilypond/lily/note-performer.cc,v retrieving revision 1.58 diff -u -p -u -r1.58 note-performer.cc --- lily/note-performer.cc 4 Feb 2005 12:35:32 -0000 1.58 +++ lily/note-performer.cc 6 Feb 2005 10:10:05 -0000 @@ -28,7 +28,6 @@ protected: private: Link_array note_evs_; Link_array notes_; - Link_array delayeds_; }; void @@ -65,21 +64,6 @@ Note_performer::stop_translation_timeste { // why don't grace notes show up here? // --> grace notes effectively do not get delayed - Global_context * global = get_global_context (); - for (int i = 0; i < notes_.size (); i++) - { - Audio_note* n = notes_[i]; - Moment m = n->delayed_until_mom_; - if (m.to_bool ()) - { - global->add_moment_to_process (m); - delayeds_.push (n); - notes_[i] = 0; - notes_.del (i); - i--; - } - } - Moment now = now_mom (); for (int i = 0; i < notes_.size (); i++) { @@ -87,17 +71,6 @@ Note_performer::stop_translation_timeste } notes_.clear (); note_evs_.clear (); - for (int i = 0; i < delayeds_.size (); i++) - { - Audio_note* n = delayeds_[i]; - if (n->delayed_until_mom_ <= now) - { - play_element (n); - delayeds_[i] = 0; - delayeds_.del (i); - i--; - } - } } bool Index: lily/include/audio-item.hh =================================================================== RCS file: /cvsroot/lilypond/lilypond/lily/include/audio-item.hh,v retrieving revision 1.33 diff -u -p -u -r1.33 audio-item.hh --- lily/include/audio-item.hh 31 Jan 2005 12:53:12 -0000 1.33 +++ lily/include/audio-item.hh 6 Feb 2005 10:10:05 -0000 @@ -61,8 +61,6 @@ public: Pitch pitch_; Moment length_mom_; - Moment delayed_mom_; - Moment delayed_until_mom_; int transposing_; Audio_note* tied_; };