X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftie-performer.cc;h=9f6ae786696234f72e85bd004ded06c1bfbfe8d4;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=685806ff95db53709fc5c423015b002b5a24e5d6;hpb=38fa6a3720e1187ec51514ab2a209c67ce19e14c;p=lilypond.git diff --git a/lily/tie-performer.cc b/lily/tie-performer.cc index 685806ff95..9f6ae78669 100644 --- a/lily/tie-performer.cc +++ b/lily/tie-performer.cc @@ -1,229 +1,124 @@ -/* - tie-performer.cc -- implement Tie_performer - +/* + tie-performer.cc -- implement Tie_performer + source file of the GNU LilyPond music typesetter - - (c) 1999--2000 Jan Nieuwenhuizen - - */ -#include "command-request.hh" -#include "audio-item.hh" -#include "musical-request.hh" -#include "pqueue.hh" + (c) 1998--2008 Han-Wen Nienhuys +*/ + #include "performer.hh" -struct CNote_melodic_tuple { - Melodic_req *req_l_ ; - Audio_note *note_l_; - 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" -inline int compare (CNote_melodic_tuple const &a, CNote_melodic_tuple const &b) +class Tie_performer : public Performer { - return CNote_melodic_tuple::time_compare (a,b); -} + Stream_event *event_; + vector now_heads_; + vector now_tied_heads_; + vector heads_to_tie_; + bool ties_created_; -/** - 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: - VIRTUAL_COPY_CONS (Translator); - - Tie_performer (); - -private: - bool done_; - PQueue past_notes_pq_; - Tie_req *req_l_; - Array now_notes_; - Array stopped_notes_; - Link_array tie_p_arr_; - protected: - virtual void do_creation_processing (); - virtual void start_translation_timestep (); - virtual void stop_translation_timestep (); - virtual void acknowledge_grob (Audio_element_info); - virtual bool try_music (Music*); - virtual void create_grobs (); + void stop_translation_timestep (); + void start_translation_timestep (); + virtual void acknowledge_audio_element (Audio_element_info); + void process_music (); + DECLARE_TRANSLATOR_LISTENER (tie); +public: + TRANSLATOR_DECLARATIONS (Tie_performer); }; -ADD_THIS_TRANSLATOR (Tie_performer); - - Tie_performer::Tie_performer () { - // URG - // if we don't do this, lily dumps core - // which means that ``do_creation_processing'' and - // ``start_translation_timestep'' did not happen?! - do_creation_processing (); + event_ = 0; + ties_created_ = false; } +IMPLEMENT_TRANSLATOR_LISTENER (Tie_performer, tie); void -Tie_performer::do_creation_processing () +Tie_performer::listen_tie (Stream_event *ev) { - req_l_ = 0; - done_ = false; -} - - -bool -Tie_performer::try_music (Music *m) -{ - if (!req_l_) - { - if (Tie_req * c = dynamic_cast (m)) - { - req_l_ = c; - return true; - } - } - return false; + event_ = ev; } void -Tie_performer::acknowledge_grob (Audio_element_info i) +Tie_performer::process_music () { - if (Audio_note *nh = dynamic_cast (i.elem_l_)) - { - Note_req * m = dynamic_cast (i.req_l_); - 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_grobs () +Tie_performer::acknowledge_audio_element (Audio_element_info inf) { - if (req_l_ && ! done_) + if (Audio_note *an = dynamic_cast (inf.elem_)) { - 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 (an->tie_event_) + now_tied_heads_.push_back (inf); + else + now_heads_.push_back (inf); - if (req_l_) - { - 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 (vsize i = heads_to_tie_.size (); i--;) { - int comp - = Pitch::compare (*unsmob_pitch (now_notes_[i].req_l_->get_mus_property ("pitch") ), - *unsmob_pitch (stopped_notes_[j].req_l_->get_mus_property ("pitch"))); + Stream_event *right_mus = inf.event_; - if (comp) - { - (comp < 0) ? i ++ : j++; - continue; - } - else + Audio_note *th = dynamic_cast (heads_to_tie_[i].elem_); + Stream_event *left_mus = heads_to_tie_[i].event_; + + if (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 > tie_p_arr_.size ()) - { - Audio_tie * p = new Audio_tie; - p->set_note (LEFT, stopped_notes_[j].note_l_); - p->set_note (RIGHT, now_notes_[i].note_l_); - tie_p_arr_.push (p); - announce_element (Audio_element_info (p, req_l_)); - } - i++; - j++; - + an->tie_to (th); + ties_created_ = true; } } - - if (!tie_p_arr_.size ()) - { - req_l_->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< tie_p_arr_.size (); i++) - { - //play_element (tie_p_arr_[i]); - tie_p_arr_[i]->note_l_drul_[RIGHT]->tie_to (tie_p_arr_[i]->note_l_drul_[LEFT]); - } - tie_p_arr_.clear (); + context ()->set_property ("tieMelismaBusy", + ly_bool2scm (heads_to_tie_.size ())); } void -Tie_performer::start_translation_timestep () +Tie_performer::stop_translation_timestep () { - req_l_ =0; - done_ = false; - Moment now = now_mom (); - while (past_notes_pq_.size () && past_notes_pq_.front ().end_ < now) - past_notes_pq_.delmin (); -} + if (ties_created_) + { + heads_to_tie_.clear (); + ties_created_ = false; + } + if (event_) + { + heads_to_tie_ = now_heads_; + } -CNote_melodic_tuple::CNote_melodic_tuple () -{ - note_l_ =0; - req_l_ =0; - end_ = 0; -} + for (vsize i = now_tied_heads_.size (); i--;) + heads_to_tie_.push_back (now_tied_heads_[i]); -CNote_melodic_tuple::CNote_melodic_tuple (Audio_note *h, Melodic_req*m, Moment mom) -{ - note_l_ = h; - req_l_ = m; - end_ = mom; + event_ = 0; + now_heads_.clear (); + now_tied_heads_.clear (); } -int -CNote_melodic_tuple::pitch_compare (CNote_melodic_tuple const&h1, - CNote_melodic_tuple const &h2) -{ - SCM p1 = h1.req_l_->get_mus_property ("pitch"); - SCM p2 = h2.req_l_->get_mus_property ("pitch"); - return Pitch::compare (*unsmob_pitch (p1), - *unsmob_pitch (p2)); -} +ADD_TRANSLATOR (Tie_performer, + /* doc */ + "Generate ties between note heads of equal pitch.", -int -CNote_melodic_tuple::time_compare (CNote_melodic_tuple const&h1, - CNote_melodic_tuple const &h2) -{ - return (h1.end_ - h2.end_ ).sign (); -} + /* create */ + "", + + /* read */ + "tieMelismaBusy", + + /* write */ + "" + );