source file of the GNU LilyPond music typesetter
- (c) 1999--2002 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 1999--2004 Jan Nieuwenhuizen <janneke@gnu.org>
*/
-
+#include "translator-group.hh"
#include "audio-item.hh"
-#include "request.hh"
+#include "event.hh"
#include "pqueue.hh"
#include "performer.hh"
struct CNote_melodic_tuple {
- Music *req_ ;
+ Music *event_ ;
Audio_note *note_;
Moment end_;
CNote_melodic_tuple ();
public:
TRANSLATOR_DECLARATIONS(Tie_performer);
private:
- bool done_;
- PQueue<CNote_melodic_tuple> past_notes_pq_;
- Music *req_;
+
+ bool ties_created_;
Array<CNote_melodic_tuple> now_notes_;
- Array<CNote_melodic_tuple> stopped_notes_;
+ Array<CNote_melodic_tuple> tied_notes_;
+
+ Music *event_;
+ Music * prev_event_;
+
Link_array<Audio_tie> ties_;
protected:
- virtual void initialize ();
+ virtual void process_music ();
virtual void start_translation_timestep ();
virtual void stop_translation_timestep ();
virtual void acknowledge_audio_element (Audio_element_info);
virtual void create_audio_elements ();
};
+void
+Tie_performer::process_music ()
+{
+ if (event_)
+ daddy_trans_->set_property ("tieMelismaBusy", SCM_BOOL_T);
+}
+
Tie_performer::Tie_performer ()
{
- req_ = 0;
- done_ = false;
+ event_ = 0;
+ ties_created_ = false;
+ prev_event_ = 0;
}
ENTER_DESCRIPTION (Tie_performer, "", "",
"", "", "");
-void
-Tie_performer::initialize ()
-{
- req_ = 0;
-}
-
bool
Tie_performer::try_music (Music *m)
{
- if (!req_)
+ if (!event_)
{
- req_ = m;
+ event_ = m;
return true;
}
return false;
{
if (Audio_note *nh = dynamic_cast<Audio_note *> (i.elem_))
{
- Music *m = i.req_;
+ Music *m = i.event_;
if (m->is_mus_type ("note-event"))
- now_notes_.push (CNote_melodic_tuple (nh, m, now_mom ()+ m->length_mom ()));
+ now_notes_.push (CNote_melodic_tuple (nh, m, now_mom ()+ m->get_length ()));
}
}
void
Tie_performer::create_audio_elements ()
{
- if (req_ && ! done_)
+ /*
+ This is a nested loop. Not optimal, but good enough.
+ */
+ if (tied_notes_.size ())
{
- Moment now = now_mom ();
- Link_array<Audio_note> 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_)
- {
- 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
- = Pitch::compare (*unsmob_pitch (now_notes_[i].req_->get_mus_property ("pitch")),
- *unsmob_pitch (stopped_notes_[j].req_->get_mus_property ("pitch")));
+ if (tied_notes_[i].end_ != now)
+ continue;
- if (comp)
- {
- (comp < 0) ? i ++ : j++;
- continue;
- }
- else
+ for (int j = now_notes_.size(); j--;)
{
- 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 > ties_.size ())
+ if (comp == 0)
{
+
Audio_tie * p = new Audio_tie;
- p->set_note (LEFT, stopped_notes_[j].note_);
- p->set_note (RIGHT, now_notes_[i].note_);
+ 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, req_));
+ announce_element (Audio_element_info (p, event_));
+ ties_created_ = true;
+
+ tied_notes_.del (i);
+ break ;
}
- i++;
- j++;
-
}
}
-
- if (!ties_.size ())
- {
- req_->origin ()->warning (_ ("No ties were created!"));
- }
}
}
void
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 ())
+ {
+ prev_event_->origin ()->warning (_ ("No ties were performed."));
+ }
+
+ if (ties_created_)
+ {
+ prev_event_ = 0;
+ tied_notes_.clear();
+ }
+
+ if (event_)
{
- past_notes_pq_.insert (now_notes_[i]);
+ tied_notes_ = now_notes_ ;
+ prev_event_ = event_;
}
- 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]);
- }
+ 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::start_translation_timestep ()
{
- req_ =0;
- done_ = false;
+ 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_ =0;
- req_ =0;
+ event_ =0;
end_ = 0;
}
CNote_melodic_tuple::CNote_melodic_tuple (Audio_note *h, Music*m, Moment mom)
{
note_ = h;
- req_ = m;
+ event_ = m;
end_ = mom;
}
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");
+ 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));
}
projects / lilypond.git / blobdiff