]> git.donarmstrong.com Git - lilypond.git/blobdiff - lily/tie-performer.cc
* GNUmakefile.in (EXTRA_DIST_FILES): remove VIM stuff.
[lilypond.git] / lily / tie-performer.cc
index 51d1375d849d376995eea6dd56a834c9b8a12d56..bfb0435eeacae31f50eea602839b5954e7a52165 100644 (file)
 /*   
-  tie-performer.cc --  implement Tie_performer
+  new-tie-engraver.cc --  implement Tie_performer
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
-#include "tie-performer.hh"
-#include "command-request.hh"
+#include "context.hh"
 #include "audio-item.hh"
-#include "musical-request.hh"
+#include "event.hh"
+#include "pqueue.hh"
+#include "performer.hh"
 
+class Tie_performer : public Performer
+{
+  Music *event_;
+  Music *last_event_;
+  Array<Audio_element_info> now_heads_;
+  Array<Audio_element_info> heads_to_tie_;
 
-ADD_THIS_TRANSLATOR (Tie_performer);
+  bool ties_created_;
+  
+protected:
+  virtual void stop_translation_timestep ();
+  virtual void start_translation_timestep ();
+  virtual void acknowledge_audio_element (Audio_element_info);
+  virtual bool try_music (Music*);
+  virtual void process_music ();
+public:
+  TRANSLATOR_DECLARATIONS(Tie_performer);
+};
 
-Tie_performer::Tie_performer()
-{
-  req_l_ = 0;
-}
 
-bool
-Tie_performer::do_try_music (Music *m)
+
+Tie_performer::Tie_performer ()
 {
-  if (!req_l_)
-    {
-      if (Tie_req * c = dynamic_cast<Tie_req*> (m))
-       {
-         req_l_ = c;
-         return true;
-       }
-    }
-  return false;
+  event_ = 0;
+  last_event_  = 0;
 }
 
-void
-Tie_performer::acknowledge_element (Audio_element_info i)
+
+bool
+Tie_performer::try_music (Music *mus)
 {
-  if (Audio_note *nh = dynamic_cast<Audio_note *> (i.elem_l_))
+  if (mus->is_mus_type ("tie-event"))
     {
-      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 ()));
+      event_ = mus;
     }
+  
+  return true;
 }
 
 void
-Tie_performer::do_process_music ()
+Tie_performer::process_music ()
 {
-  if (req_l_)
-    {
-      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 ());
-    }
+  if (event_)
+    daddy_context_->set_property ("tieMelismaBusy", SCM_BOOL_T);
 }
 
 void
-Tie_performer::process_acknowledged ()
+Tie_performer::acknowledge_audio_element (Audio_element_info inf)
 {
-  if (req_l_)
+  if (Audio_note * an = dynamic_cast<Audio_note *> (inf.elem_))
     {
-      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 ())
+      now_heads_.push (inf);
+      for  (int i = heads_to_tie_.size (); i--;)
        {
-         int comp
-           = Musical_pitch::compare (now_notes_[i].req_l_->pitch_ ,
-                                     stopped_notes_[j].req_l_->pitch_);
-
-         if (comp)
+         Music * right_mus = inf.event_;
+         
+         Audio_note *th =  dynamic_cast<Audio_note*> (heads_to_tie_[i].elem_);
+         Music * left_mus = heads_to_tie_[i].event_;
+
+         if (right_mus && left_mus
+             && gh_equal_p (right_mus->get_property ("pitch"),
+                            left_mus->get_property ("pitch")))
            {
-             (comp < 0) ? i ++ : j++;
-             continue;
+             an->tie_to (th);
            }
-         else
-           {
-             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++;
-             
-           }
-       }
-      
-      if (!tie_p_arr_.size ())
-       {
-         req_l_->warning (_("No ties were created!"));
        }
-      
     }
 }
 
 void
-Tie_performer::do_pre_move_processing ()
+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 ();
+  daddy_context_->set_property ("tieMelismaBusy",
+                             gh_bool2scm (heads_to_tie_.size ()));
+      
 }
 
 void
-Tie_performer::do_post_move_processing ()
+Tie_performer::stop_translation_timestep ()
 {
-  req_l_ =0;
-  Moment now = now_mom ();
-  while (past_notes_pq_.size () && past_notes_pq_.front ().end_ < now)
-    past_notes_pq_.delmin ();
-}
-
-
-CNote_melodic_tuple::CNote_melodic_tuple ()
-{
-  note_l_ =0;
-  req_l_ =0;
-  end_ = 0;
-}
-
-CNote_melodic_tuple::CNote_melodic_tuple (Audio_note *h, Melodic_req*m, Moment mom)
-{
-  note_l_ = h;
-  req_l_ = m;
-  end_ = mom;
-}
-
-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_);
+  if (ties_created_)
+    {
+      heads_to_tie_.clear ();
+      last_event_ = 0;
+    }
+  
+  if (event_)
+    {
+      heads_to_tie_ = now_heads_;
+      last_event_ = event_;
+    }
+  event_ = 0;
+  now_heads_.clear ();
 }
 
-int
-CNote_melodic_tuple::time_compare (CNote_melodic_tuple const&h1,
-                                  CNote_melodic_tuple const &h2)
-{
-  return (h1.end_ - h2.end_ ).sign ();
-}
+ENTER_DESCRIPTION(Tie_performer,
+/* descr */       "Generate ties between noteheads of equal pitch.",
+/* creats*/       "",
+/* accepts */     "tie-event",
+/* acks  */       "",
+/* reads */       "tieMelismaBusy",
+/* write */       "");