''

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

diff --git a/lily/tie-performer.cc b/lily/tie-performer.cc
index fca448b6227ee89149b7cbc6dde43156fc9065fd..413e65fabc075f4c3f374ea3ba0885dea182f282 100644 (file)
--- a/lily/tie-performer.cc
+++ b/lily/tie-performer.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1999--2002 Jan Nieuwenhuizen <janneke@gnu.org>
   
  */
 
@@ -39,8 +39,7 @@ inline int compare (CNote_melodic_tuple const &a, CNote_melodic_tuple const &b)
 class Tie_performer : public Performer
 {
 public:
-  VIRTUAL_COPY_CONS(Translator);
-  Tie_performer ();
+  TRANSLATOR_DECLARATIONS(Tie_performer);
 private:
   bool done_;
   PQueue<CNote_melodic_tuple> past_notes_pq_;
@@ -53,9 +52,9 @@ protected:
   virtual void initialize ();
   virtual void start_translation_timestep ();
   virtual void stop_translation_timestep ();
-  virtual void acknowledge_grob (Audio_element_info);
+  virtual void acknowledge_audio_element (Audio_element_info);
   virtual bool try_music (Music*);
-  virtual void create_grobs ();
+  virtual void create_audio_elements ();
 };
 
 
@@ -65,20 +64,9 @@ Tie_performer::Tie_performer ()
   done_ = false;
 }
 
-ADD_THIS_TRANSLATOR (Tie_performer);
+ENTER_DESCRIPTION (Tie_performer, "", "", "", "", "");
 
 
-#if 0
-Tie_performer::Tie_performer ()
-{
-  // URG
-  // if we don't do this, lily dumps core
-  // which means that ``initialize'' and
-  // ``start_translation_timestep'' did not happen?!
-  initialize ();
-}
-#endif
-
 void
 Tie_performer::initialize ()
 {
@@ -101,19 +89,19 @@ Tie_performer::try_music (Music *m)
 }
 
 void
-Tie_performer::acknowledge_grob (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::create_grobs ()
+Tie_performer::create_audio_elements ()
 {
   if (req_l_ && ! done_)
     {
@@ -131,19 +119,19 @@ Tie_performer::create_grobs ()
   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
@@ -170,11 +158,12 @@ Tie_performer::create_grobs ()
       
       if (!tie_p_arr_.size ())
        {
-         req_l_->origin ()->warning (_("No ties were created!"));
+         req_l_->origin ()->warning (_ ("No ties were created!"));
        }
     }
 }
 
+
 void
 Tie_performer::stop_translation_timestep ()
 {
@@ -231,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 ();
 }
+