* input/test/spanner-after-break-tweak.ly: import

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

diff --git a/lily/tie-performer.cc b/lily/tie-performer.cc
index 53460fae9c9500939965049b125f152c1b6ebae9..dd438f1f20638b79ea535f361a2ff2d8605d9a5b 100644 (file)
--- a/lily/tie-performer.cc
+++ b/lily/tie-performer.cc
@@ -3,22 +3,22 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1999--2003 Jan Nieuwenhuizen <janneke@gnu.org>
   
  */
 
-#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 {
-  Melodic_req *req_l_ ;
-  Audio_note *note_l_;
+  Music *req_ ;
+  Audio_note *note_;
   Moment end_;
   CNote_melodic_tuple ();
-  CNote_melodic_tuple (Audio_note*, Melodic_req*, Moment);
+  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 &);  
 };
@@ -31,7 +31,7 @@ inline int compare (CNote_melodic_tuple const &a, CNote_melodic_tuple const &b)
 
 /**
    Manufacture ties.  Acknowledge notes, and put them into a
-   priority queue. If we have a Tie_req, connect the notes that finish
+   priority queue. If we have a Music, connect the notes that finish
    just at this time, and note that start at this time.
 
    TODO: should share code with Tie_engraver ?
@@ -43,10 +43,10 @@ public:
 private:
   bool done_;
   PQueue<CNote_melodic_tuple> past_notes_pq_;
-  Tie_req *req_l_;
+  Music *req_;
   Array<CNote_melodic_tuple> now_notes_;
   Array<CNote_melodic_tuple> stopped_notes_;
-  Link_array<Audio_tie> tie_p_arr_;
+  Link_array<Audio_tie> ties_;
   
 protected:
   virtual void initialize ();
@@ -60,30 +60,29 @@ protected:
 
 Tie_performer::Tie_performer ()
 {
-  req_l_ = 0;
+  req_ = 0;
   done_ = false;
 }
 
-ENTER_DESCRIPTION (Tie_performer, "", "", "", "", "");
+ENTER_DESCRIPTION (Tie_performer, "", "",
+                  "tie-event",
+                  "", "", "");
 
 
 void
 Tie_performer::initialize ()
 {
-  req_l_ = 0;
+  req_ = 0;
 }
 
 
 bool
 Tie_performer::try_music (Music *m)
 {
-  if (!req_l_)
+  if (!req_)
     {
-      if (Tie_req * c = dynamic_cast<Tie_req*> (m))
-       {
-         req_l_ = c;
-         return true;
-       }
+      req_ = m;
+      return true;
     }
   return false;
 }
@@ -91,19 +90,18 @@ Tie_performer::try_music (Music *m)
 void
 Tie_performer::acknowledge_audio_element (Audio_element_info i)
 {
-  if (Audio_note *nh = dynamic_cast<Audio_note *> (i.elem_l_))
+  if (Audio_note *nh = dynamic_cast<Audio_note *> (i.elem_))
     {
-      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 ()));
+      Music *m = i.req_;
+      if (m->is_mus_type ("note-event"))
+       now_notes_.push (CNote_melodic_tuple (nh, m, now_mom ()+ m->get_length ()));
     }
 }
 
 void
 Tie_performer::create_audio_elements ()
 {
-  if (req_l_ && ! done_)
+  if (req_ && ! done_)
     {
       Moment now = now_mom ();
       Link_array<Audio_note> nharr;
@@ -116,7 +114,7 @@ Tie_performer::create_audio_elements ()
       return;
     }
 
-  if (req_l_)
+  if (req_)
     {
       now_notes_.sort (CNote_melodic_tuple::pitch_compare);
       stopped_notes_.sort (CNote_melodic_tuple::pitch_compare);
@@ -126,8 +124,8 @@ Tie_performer::create_audio_elements ()
       while (i < now_notes_.size () && j < stopped_notes_.size ())
        {
          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")));
+           = Pitch::compare (*unsmob_pitch (now_notes_[i].req_->get_mus_property ("pitch")),
+                                     *unsmob_pitch (stopped_notes_[j].req_->get_mus_property ("pitch")));
 
          if (comp)
            {
@@ -142,13 +140,13 @@ Tie_performer::create_audio_elements ()
                 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 (tie_count > ties_.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_));
+                 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++;
@@ -156,9 +154,9 @@ Tie_performer::create_audio_elements ()
            }
        }
       
-      if (!tie_p_arr_.size ())
+      if (!ties_.size ())
        {
-         req_l_->origin ()->warning (_ ("No ties were created!"));
+         req_->origin ()->warning (_ ("No ties were created!"));
        }
     }
 }
@@ -173,18 +171,18 @@ Tie_performer::stop_translation_timestep ()
     }
   now_notes_.clear ();
 
-  for (int i=0; i<  tie_p_arr_.size (); i++)
+  for (int i=0; i<  ties_.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]);
+     //play_element (ties_[i]);
+     ties_[i]->note_l_drul_[RIGHT]->tie_to (ties_[i]->note_l_drul_[LEFT]);
    }
-  tie_p_arr_.clear ();
+  ties_.clear ();
 }
 
 void
 Tie_performer::start_translation_timestep ()
 {
-  req_l_ =0;
+  req_ =0;
   done_ = false;
   Moment now = now_mom ();
   while (past_notes_pq_.size () && past_notes_pq_.front ().end_ < now)
@@ -194,15 +192,15 @@ Tie_performer::start_translation_timestep ()
 
 CNote_melodic_tuple::CNote_melodic_tuple ()
 {
-  note_l_ =0;
-  req_l_ =0;
+  note_ =0;
+  req_ =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;
+  req_ = m;
   end_ = mom;
 }
 
@@ -210,8 +208,8 @@ 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");  
+  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));
 }