release: 1.2.7

[lilypond.git] / lily / global-translator.cc

diff --git a/lily/global-translator.cc b/lily/global-translator.cc
index d53bc4eb6d9d25639b49992624244d797ea1d7a3..8afb5771604035d7b0c324419e19567c87eb9b01 100644 (file)
--- a/lily/global-translator.cc
+++ b/lily/global-translator.cc
@@ -1,72 +1,102 @@
 /*
-  global-translator.cc -- implement 
+  global-translator.cc -- implement Global_translator
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-#include "music.hh"
 #include "global-translator.hh"
-#include "score.hh"
-#include "score-column.hh"
+#include "music-iterator.hh"
+#include "debug.hh"
 
 Global_translator::Global_translator()
 {
-    score_l_ = 0;
-    last_mom_ = 0;
+  last_mom_ = 0;
 }
 
-Translator*
-Global_translator::ancestor_l(int)
+void
+Global_translator::add_moment_to_process (Moment m)
 {
-    return this;
+  if (m  > last_mom_)
+    return;
+  
+  for (int i=0; i <  extra_mom_pq_.size(); i++)
+    if (extra_mom_pq_[i] == m)
+      return;
+  extra_mom_pq_.insert (m);
 }
 
 void
-Global_translator::add_moment_to_process(Moment m)
+Global_translator::modify_next (Moment &w)
 {
-    if (m  > last_mom_)
-       return;
-    
-    for (int i=0; i <  extra_mom_pq_.size(); i++)
-       if (extra_mom_pq_[i] == m)
-           return;
-    extra_mom_pq_.insert(m);
+  while (extra_mom_pq_.size() && 
+        extra_mom_pq_.front() <= w)
+       
+    w =extra_mom_pq_.get();
 }
 
 int
-Global_translator::depth_i()const
+Global_translator::moments_left_i() const
 {
-    return 0;
+  return extra_mom_pq_.size();
 }
 
 void
-Global_translator::set_score(Score *s)
+Global_translator::prepare (Moment m)
 {
-    score_l_ = s;
-    last_mom_ = score_l_->music_p_->time_int().max();
+  now_mom_ = m;
 }
 
-void
-Global_translator::modify_next(Moment &w)
+Moment
+Global_translator::now_mom () const
 {
-    while (extra_mom_pq_.size() && 
-       extra_mom_pq_.front() <= w)
-       
-       w =extra_mom_pq_.get();
+  return now_mom_;
 }
 
-int
-Global_translator::moments_left_i()const
+
+
+Music_output*
+Global_translator::get_output_p()
 {
-    return extra_mom_pq_.size();
+  return 0;
 }
 
 void
-Global_translator::prepare(Moment)
+Global_translator::process ()
+{
+}
+void
+Global_translator::start ()
+{
+}
+void
+Global_translator::finish ()
 {
 }
 
-IMPLEMENT_STATIC_NAME(Global_translator);
-IMPLEMENT_IS_TYPE_B1(Global_translator, Translator);
+void
+Global_translator::run_iterator_on_me (Music_iterator * iter)
+{
+  while (iter->ok() || moments_left_i ())
+    {
+      Moment w;
+      w.set_infinite (1);
+      if (iter->ok())
+       {
+         w = iter->next_moment();
+         DOUT << "proccing: " << w << '\n';
+         if (!lily_monitor->silent_b ("walking"))
+           iter->print();
+       }
+      
+      modify_next (w);
+      prepare (w);
+      
+      if (!lily_monitor->silent_b ("walking"))
+       print();
+
+      iter->process_and_next (w);
+      process();
+    }
+}