X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftie-performer.cc;h=5d237c1de3de1e3c345613518c840c6df6ede6d2;hb=71cea6af77bf3d639dcfd8ad09fd235aab22c5f7;hp=eb7b0f3c7808f40c5253442f71aa25a88d90a80c;hpb=6b9bfd374643d1eed1ea158777d796c57a2bcd3a;p=lilypond.git diff --git a/lily/tie-performer.cc b/lily/tie-performer.cc index eb7b0f3c78..5d237c1de3 100644 --- a/lily/tie-performer.cc +++ b/lily/tie-performer.cc @@ -1,227 +1,175 @@ -/* - tie-performer.cc -- implement Tie_performer - - source file of the GNU LilyPond music typesetter - - (c) 1999--2002 Jan Nieuwenhuizen - - */ - -#include "command-request.hh" -#include "audio-item.hh" -#include "musical-request.hh" -#include "pqueue.hh" +/* + This file is part of LilyPond, the GNU music typesetter. + + Copyright (C) 1998--2011 Han-Wen Nienhuys + + 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 . +*/ + #include "performer.hh" -struct CNote_melodic_tuple { - Melodic_req *req_ ; - Audio_note *note_; - Moment end_; - CNote_melodic_tuple (); - CNote_melodic_tuple (Audio_note*, Melodic_req*, Moment); - static int pitch_compare (CNote_melodic_tuple const &, CNote_melodic_tuple const &); - static int time_compare (CNote_melodic_tuple const &, CNote_melodic_tuple const &); -}; +#include "audio-item.hh" +#include "context.hh" +#include "stream-event.hh" +#include "translator.icc" +#include -inline int compare (CNote_melodic_tuple const &a, CNote_melodic_tuple const &b) +struct Head_audio_event_tuple { - return CNote_melodic_tuple::time_compare (a,b); -} - + Audio_element_info head_; + // The end moment of the note, so we can calculate a skip and check whether + // the note still goes on + Moment end_moment_; + Head_audio_event_tuple () {} + Head_audio_event_tuple (Audio_element_info h, Moment m) + { + head_ = h; + end_moment_ = m; + } +}; -/** - Manufacture ties. Acknowledge notes, and put them into a - priority queue. If we have a Tie_req, connect the notes that finish - just at this time, and note that start at this time. - TODO: should share code with Tie_engraver ? - */ class Tie_performer : public Performer { -public: - TRANSLATOR_DECLARATIONS(Tie_performer); -private: - bool done_; - PQueue past_notes_pq_; - Tie_req *req_; - Array now_notes_; - Array stopped_notes_; - Link_array ties_; - + Stream_event *event_; + list now_heads_; + list now_tied_heads_; // new tied notes + list heads_to_tie_; // heads waiting for closing tie + protected: - virtual void initialize (); - virtual void start_translation_timestep (); - virtual void stop_translation_timestep (); + void stop_translation_timestep (); + void start_translation_timestep (); virtual void acknowledge_audio_element (Audio_element_info); - virtual bool try_music (Music*); - virtual void create_audio_elements (); + void process_music (); + DECLARE_TRANSLATOR_LISTENER (tie); +public: + TRANSLATOR_DECLARATIONS (Tie_performer); }; - Tie_performer::Tie_performer () { - req_ = 0; - done_ = false; + event_ = 0; } -ENTER_DESCRIPTION (Tie_performer, "", "", - "general-music", - "", "", ""); - - +IMPLEMENT_TRANSLATOR_LISTENER (Tie_performer, tie); void -Tie_performer::initialize () +Tie_performer::listen_tie (Stream_event *ev) { - req_ = 0; -} - - -bool -Tie_performer::try_music (Music *m) -{ - if (!req_) - { - if (Tie_req * c = dynamic_cast (m)) - { - req_ = c; - return true; - } - } - return false; + event_ = ev; } void -Tie_performer::acknowledge_audio_element (Audio_element_info i) +Tie_performer::process_music () { - if (Audio_note *nh = dynamic_cast (i.elem_)) - { - Note_req * m = dynamic_cast (i.req_); - if (!m) - return; - now_notes_.push (CNote_melodic_tuple (nh, m, now_mom ()+ m->length_mom ())); - } + if (event_) + context ()->set_property ("tieMelismaBusy", SCM_BOOL_T); } void -Tie_performer::create_audio_elements () +Tie_performer::acknowledge_audio_element (Audio_element_info inf) { - if (req_ && ! done_) - { - Moment now = now_mom (); - Link_array nharr; - - stopped_notes_.clear (); - while (past_notes_pq_.size () - && past_notes_pq_.front ().end_ == now) - stopped_notes_.push (past_notes_pq_.get ()); - done_ = true; - return; - } - - if (req_) + if (Audio_note *an = dynamic_cast (inf.elem_)) { - now_notes_.sort (CNote_melodic_tuple::pitch_compare); - stopped_notes_.sort (CNote_melodic_tuple::pitch_compare); - int i=0; - int j=0; - int tie_count=0; - while (i < now_notes_.size () && j < stopped_notes_.size ()) + // for each tied note, store the info and its end moment, so we can + // later on check whether (1) the note is still ongoing and (2) how + // long the skip is with tieWaitForNote + Head_audio_event_tuple inf_mom (inf, now_mom () + an->length_mom_); + if (an->tie_event_) + now_tied_heads_.push_back (inf_mom); + else + now_heads_.push_back (inf_mom); + + // Find a previous note that ties to the current note. If it exists, + // remove it from the heads_to_tie vector and create the tie + list::iterator it; + bool found = false; + Stream_event *right_mus = inf.event_; + for (it = heads_to_tie_.begin (); + !found && (it != heads_to_tie_.end()); + it++) { - int comp - = Pitch::compare (*unsmob_pitch (now_notes_[i].req_->get_mus_property ("pitch")), - *unsmob_pitch (stopped_notes_[j].req_->get_mus_property ("pitch"))); + Audio_element_info et = (*it).head_; + Audio_note *th = dynamic_cast (et.elem_); + Stream_event *left_mus = et.event_; - if (comp) - { - (comp < 0) ? i ++ : j++; - continue; - } - else + if (th && right_mus && left_mus + && ly_is_equal (right_mus->get_property ("pitch"), + left_mus->get_property ("pitch"))) { - tie_count ++; - - /* don't go around recreating ties that were already - made. Not infallible. Due to reordering in sort (), - we will make the wrong ties when notenotes are - added. */ - if (tie_count > ties_.size ()) - { - Audio_tie * p = new Audio_tie; - p->set_note (LEFT, stopped_notes_[j].note_); - p->set_note (RIGHT, now_notes_[i].note_); - ties_.push (p); - announce_element (Audio_element_info (p, req_)); - } - i++; - j++; - + found = true; + // (*it).moment_ already stores the end of the tied note! + Moment skip = now_mom() - (*it).end_moment_; + an->tie_to (th, skip); + // this invalidates the iterator, we are leaving the loop anyway + heads_to_tie_.erase (it); } } - - if (!ties_.size ()) - { - req_->origin ()->warning (_ ("No ties were created!")); - } } } - void -Tie_performer::stop_translation_timestep () +Tie_performer::start_translation_timestep () { - for (int i=0; i < now_notes_.size (); i++) - { - past_notes_pq_.insert (now_notes_[i]); - } - now_notes_.clear (); - - for (int i=0; i< ties_.size (); i++) - { - //play_element (ties_[i]); - ties_[i]->note_l_drul_[RIGHT]->tie_to (ties_[i]->note_l_drul_[LEFT]); - } - ties_.clear (); + context ()->set_property ("tieMelismaBusy", + ly_bool2scm (heads_to_tie_.size ())); } +// a predicate implemented as a class, used to delete all tied notes with end +// moment in the past: +class end_moment_passed +{ +protected: + Moment now; +public: + end_moment_passed (Moment mom) : now (mom) {} + bool operator() (const Head_audio_event_tuple &value) { + return (value.end_moment_ <= now); + } +}; + void -Tie_performer::start_translation_timestep () +Tie_performer::stop_translation_timestep () { - req_ =0; - done_ = false; - Moment now = now_mom (); - while (past_notes_pq_.size () && past_notes_pq_.front ().end_ < now) - past_notes_pq_.delmin (); -} + // We might have dangling open ties like c~ d. Close them, unless the first + // note is still ongoing or we have we have tieWaitForNote set... + if (!to_boolean (get_property ("tieWaitForNote"))) + { + heads_to_tie_.remove_if (end_moment_passed (now_mom ())); + } + // Append now_heads_ and now_tied_heads to heads_to_tie_ for the next time step + if (event_) + { + heads_to_tie_.splice (heads_to_tie_.end (), now_heads_); + } + heads_to_tie_.splice (heads_to_tie_.end (), now_tied_heads_); -CNote_melodic_tuple::CNote_melodic_tuple () -{ - note_ =0; - req_ =0; - end_ = 0; + event_ = 0; + now_heads_.clear (); + now_tied_heads_.clear (); } -CNote_melodic_tuple::CNote_melodic_tuple (Audio_note *h, Melodic_req*m, Moment mom) -{ - note_ = h; - req_ = m; - end_ = mom; -} +ADD_TRANSLATOR (Tie_performer, + /* doc */ + "Generate ties between note heads of equal pitch.", -int -CNote_melodic_tuple::pitch_compare (CNote_melodic_tuple const&h1, - CNote_melodic_tuple const &h2) -{ - SCM p1 = h1.req_->get_mus_property ("pitch"); - SCM p2 = h2.req_->get_mus_property ("pitch"); - return Pitch::compare (*unsmob_pitch (p1), - *unsmob_pitch (p2)); -} + /* create */ + "", -int -CNote_melodic_tuple::time_compare (CNote_melodic_tuple const&h1, - CNote_melodic_tuple const &h2) -{ - return (h1.end_ - h2.end_).main_part_.sign (); -} + /* read */ + "tieWaitForNote", + /* write */ + "tieMelismaBusy" + );