X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftie-performer.cc;h=da9696c2a5890cf8dad25f40c3f15c2d80daf135;hb=233b5a1921a6c2c438fb1516abdcc01cc5a244e8;hp=0d7d5a0257dbe76a66dfbb0ba9383b357c1c196e;hpb=0ac652bb955a79fcb1655a5fade88bc6e1e551c3;p=lilypond.git diff --git a/lily/tie-performer.cc b/lily/tie-performer.cc index 0d7d5a0257..da9696c2a5 100644 --- a/lily/tie-performer.cc +++ b/lily/tie-performer.cc @@ -1,158 +1,205 @@ /* - tie-performer.cc -- implement + tie-performer.cc -- implement Tie_performer source file of the GNU LilyPond music typesetter - (c) 1999 Jan Nieuwenhuizen + (c) 1999--2003 Jan Nieuwenhuizen */ -#include "tie-performer.hh" -#include "command-request.hh" + #include "audio-item.hh" -#include "musical-request.hh" +#include "event.hh" +#include "pqueue.hh" +#include "performer.hh" + +struct CNote_melodic_tuple { + Music *event_ ; + Audio_note *note_; + Moment end_; + CNote_melodic_tuple (); + CNote_melodic_tuple (Audio_note*, Music*, 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 &); +}; + +inline int compare (CNote_melodic_tuple const &a, CNote_melodic_tuple const &b) +{ + return CNote_melodic_tuple::time_compare (a,b); +} -ADD_THIS_TRANSLATOR (Tie_performer); +/** + Manufacture ties. Acknowledge notes, and put them into a + priority queue. If we have a Music, connect the notes that finish + just at this time, and note that start at this time. -Tie_performer::Tie_performer() + TODO: should share code with Tie_engraver ? + */ +class Tie_performer : public Performer { - req_l_ = 0; -} +public: + TRANSLATOR_DECLARATIONS(Tie_performer); +private: -bool -Tie_performer::do_try_music (Music *m) + bool ties_created_; + Array now_notes_; + Array tied_notes_; + + Music *event_; + Music * prev_event_; + + Link_array ties_; + +protected: + virtual void initialize (); + virtual void start_translation_timestep (); + virtual void stop_translation_timestep (); + virtual void acknowledge_audio_element (Audio_element_info); + virtual bool try_music (Music*); + virtual void create_audio_elements (); +}; + + +Tie_performer::Tie_performer () { - if (Tie_req * c = dynamic_cast (m)) - { - req_l_ = c; - return true; - } - return false; + event_ = 0; + ties_created_ = false; } +ENTER_DESCRIPTION (Tie_performer, "", "", + "tie-event", + "", "", ""); + + void -Tie_performer::acknowledge_element (Audio_element_info i) +Tie_performer::initialize () +{ + event_ = 0; + prev_event_ = 0; +} + + +bool +Tie_performer::try_music (Music *m) { - if (Audio_note *nh = dynamic_cast (i.elem_l_)) + if (!event_) { - Note_req * m = dynamic_cast (i.req_l_); - if (!m) - return; - now_notes_.push (CNote_melodic_tuple (nh, m, now_mom()+ m->length_mom ())); + event_ = m; + return true; } + return false; } void -Tie_performer::do_process_requests () +Tie_performer::acknowledge_audio_element (Audio_element_info i) { - if (req_l_) + if (Audio_note *nh = dynamic_cast (i.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 ()); + Music *m = i.event_; + if (m->is_mus_type ("note-event")) + now_notes_.push (CNote_melodic_tuple (nh, m, now_mom ()+ m->get_length ())); } } void -Tie_performer::process_acknowledged () +Tie_performer::create_audio_elements () { - if (req_l_) + /* + This is a nested loop. Not optimal, but good enough. + */ + if (tied_notes_.size ()) { - 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 ()) + Moment now = now_mom(); + for (int i = tied_notes_.size (); i--; ) { - int comp - = Musical_pitch::compare (now_notes_[i].req_l_->pitch_ , - stopped_notes_[j].req_l_->pitch_); + if (tied_notes_[i].end_ != now) + continue; - if (comp) + for (int j = now_notes_.size(); j--;) { - (comp < 0) ? i ++ : j++; - continue; - } - else - { - tie_count ++; + int comp + = Pitch::compare (*unsmob_pitch (tied_notes_[i].event_->get_mus_property ("pitch")), + *unsmob_pitch (now_notes_[j].event_->get_mus_property ("pitch"))); - /* 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 ()) + if (comp == 0) { + 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_)); + p->set_note (LEFT, tied_notes_[i].note_); + p->set_note (RIGHT, now_notes_[j].note_); + ties_.push (p); + announce_element (Audio_element_info (p, event_)); + ties_created_ = true; + + tied_notes_.del (i); + break ; } - i++; - j++; - } } - - if (!tie_p_arr_.size ()) - { - req_l_->warning (_("No ties were created!")); - } - } } + void -Tie_performer::do_pre_move_processing () +Tie_performer::stop_translation_timestep () { - for (int i=0; i < now_notes_.size (); i++) + if (prev_event_ && tied_notes_.size () && !ties_.size () + && now_notes_.size ()) { - past_notes_pq_.insert (now_notes_[i]); + prev_event_->origin ()->warning (_ ("No ties were performed.")); } - now_notes_.clear (); - - for (int i=0; i< tie_p_arr_.size (); i++) - { - //play_element (tie_p_arr_[i]); - /* - urg. - doesn't work for c ~ c ~ c - */ - tie_p_arr_[i]->note_l_drul_[LEFT]->length_mom_ += - tie_p_arr_[i]->note_l_drul_[RIGHT]->length_mom_; - tie_p_arr_[i]->note_l_drul_[RIGHT]->length_mom_ = 0; + + if (ties_created_) + { + prev_event_ = 0; + tied_notes_.clear(); } - tie_p_arr_.clear (); + + if (event_) + { + tied_notes_ = now_notes_ ; + prev_event_ = event_; + } + + event_ = 0; + now_notes_ .clear (); + + for (int i=ties_.size (); i--;) + { + ties_[i]->note_drul_[RIGHT]->tie_to (ties_[i]->note_drul_[LEFT]); + } + + ties_.clear (); } void -Tie_performer::do_post_move_processing () +Tie_performer::start_translation_timestep () { - req_l_ =0; + event_ =0; + ties_created_ = false; Moment now = now_mom (); - while (past_notes_pq_.size () && past_notes_pq_.front ().end_ < now) - past_notes_pq_.delmin (); + for (int i= tied_notes_.size (); i-- ;) + { + if (tied_notes_[i].end_ < now) + tied_notes_.del (i); + else + break ; + } } CNote_melodic_tuple::CNote_melodic_tuple () { - note_l_ =0; - req_l_ =0; + note_ =0; + event_ =0; end_ = 0; } -CNote_melodic_tuple::CNote_melodic_tuple (Audio_note *h, Melodic_req*m, Moment mom) +CNote_melodic_tuple::CNote_melodic_tuple (Audio_note *h, Music*m, Moment mom) { - note_l_ = h; - req_l_ = m; + note_ = h; + event_ = m; end_ = mom; } @@ -160,12 +207,16 @@ int CNote_melodic_tuple::pitch_compare (CNote_melodic_tuple const&h1, CNote_melodic_tuple const &h2) { - return Melodic_req::compare (*h1.req_l_, *h2.req_l_); + SCM p1 = h1.event_->get_mus_property ("pitch"); + SCM p2 = h2.event_->get_mus_property ("pitch"); + return Pitch::compare (*unsmob_pitch (p1), + *unsmob_pitch (p2)); } int CNote_melodic_tuple::time_compare (CNote_melodic_tuple const&h1, CNote_melodic_tuple const &h2) { - return (h1.end_ - h2.end_ ).sign (); + return (h1.end_ - h2.end_).main_part_.sign (); } +