release: 1.5.29

[lilypond.git] / lily / tie-performer.cc

diff --git a/lily/tie-performer.cc b/lily/tie-performer.cc
index 521ac201c487022b55bffd7d0ae8597e64befd59..413e65fabc075f4c3f374ea3ba0885dea182f282 100644 (file)
--- a/lily/tie-performer.cc
+++ b/lily/tie-performer.cc
@@ -3,25 +3,79 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1999--2002 Jan Nieuwenhuizen <janneke@gnu.org>
   
  */
 
-#include "tie-performer.hh"
 #include "command-request.hh"
 #include "audio-item.hh"
 #include "musical-request.hh"
+#include "pqueue.hh"
+#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 &);  
+};
+
+inline int compare (CNote_melodic_tuple const &a, CNote_melodic_tuple const &b)
+{
+  return CNote_melodic_tuple::time_compare (a,b);
+}
+
+
+/**
+   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<CNote_melodic_tuple> past_notes_pq_;
+  Tie_req *req_l_;
+  Array<CNote_melodic_tuple> now_notes_;
+  Array<CNote_melodic_tuple> stopped_notes_;
+  Link_array<Audio_tie> tie_p_arr_;
+  
+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 ()
+{
+  req_l_ = 0;
+  done_ = false;
+}
 
+ENTER_DESCRIPTION (Tie_performer, "", "", "", "", "");
 
-ADD_THIS_TRANSLATOR (Tie_performer);
 
-Tie_performer::Tie_performer()
+void
+Tie_performer::initialize ()
 {
   req_l_ = 0;
 }
 
+
 bool
-Tie_performer::do_try_music (Music *m)
+Tie_performer::try_music (Music *m)
 {
   if (!req_l_)
     {
@@ -35,21 +89,21 @@ Tie_performer::do_try_music (Music *m)
 }
 
 void
-Tie_performer::acknowledge_element (Audio_element_info i)
+Tie_performer::acknowledge_audio_element (Audio_element_info i)
 {
   if (Audio_note *nh = dynamic_cast<Audio_note *> (i.elem_l_))
     {
-      Note_req * m = dynamic_cast<Note_req* > (i.req_l_);
+      Note_req * m = dynamic_cast<Note_req *> (i.req_l_);
       if (!m)
        return;
-      now_notes_.push (CNote_melodic_tuple (nh, m, now_mom()+ m->length_mom ()));
+      now_notes_.push (CNote_melodic_tuple (nh, m, now_mom ()+ m->length_mom ()));
     }
 }
 
 void
-Tie_performer::do_process_music ()
+Tie_performer::create_audio_elements ()
 {
-  if (req_l_)
+  if (req_l_ && ! done_)
     {
       Moment now = now_mom ();
       Link_array<Audio_note> nharr;
@@ -58,28 +112,26 @@ Tie_performer::do_process_music ()
       while (past_notes_pq_.size ()
             && past_notes_pq_.front ().end_ == now)
        stopped_notes_.push (past_notes_pq_.get ());
+      done_ = true;
+      return;
     }
-}
 
-void
-Tie_performer::process_acknowledged ()
-{
   if (req_l_)
     {
       now_notes_.sort (CNote_melodic_tuple::pitch_compare);
-      stopped_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 ())
+      while (i < now_notes_.size () && j < stopped_notes_.size ())
        {
          int comp
-           = Pitch::compare (*unsmob_pitch (now_notes_[i].req_l_->get_mus_property ("pitch") ),
+           = Pitch::compare (*unsmob_pitch (now_notes_[i].req_l_->get_mus_property ("pitch")),
                                      *unsmob_pitch (stopped_notes_[j].req_l_->get_mus_property ("pitch")));
 
          if (comp)
            {
-             (comp < 0) ? i ++ : j++;
+ (comp < 0) ? i ++ : j++;
              continue;
            }
          else
@@ -106,14 +158,14 @@ Tie_performer::process_acknowledged ()
       
       if (!tie_p_arr_.size ())
        {
-         req_l_->origin ()->warning (_("No ties were created!"));
+         req_l_->origin ()->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++)
     {
@@ -130,9 +182,10 @@ Tie_performer::do_pre_move_processing ()
 }
 
 void
-Tie_performer::do_post_move_processing ()
+Tie_performer::start_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 ();
@@ -167,5 +220,6 @@ 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 ();
 }
+