X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftiming-grav.cc;h=f27e9f92befb02db8014ac3fb7f887886e05c796;hb=2862b1027f316a2f0444fa92e441ee28acf7a463;hp=251c8065364562b16242cd7a87db3aa15a1ba1f5;hpb=68ffccad7c4d4ce0386cb60c537c99523e61c4d9;p=lilypond.git

diff --git a/lily/timing-grav.cc b/lily/timing-grav.cc
index 251c806536..f27e9f92be 100644
--- a/lily/timing-grav.cc
+++ b/lily/timing-grav.cc
@@ -5,8 +5,7 @@
 
   (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 */
-#if 0
-
+#include "score-grav.hh"
 #include "timing-grav.hh"
 #include "command-request.hh"
 
@@ -23,5 +22,123 @@ Timing_engraver::fill_staff_info (Staff_info &inf)
   inf.rhythmic_C_ = &default_grouping_;
 }
 
+bool
+Timing_engraver::do_try_request(Request*r)
+{
+  Command_req * c = r->command();
+  if (!(c && c->timing()))
+    return false;
+  for (int i=0; i < timing_req_l_arr_.size (); i++) 
+    {
+      if (timing_req_l_arr_[i]->equal_b(r))
+	return true;
+      if (timing_req_l_arr_[i]->name() == r->name()) 
+	{
+	  r->warning ("conflicting timing request");
+	  return false;
+	}
+    }
+  
+  timing_req_l_arr_.push(c->timing());
+  return true;
+}
+
+Meter_change_req*
+Timing_engraver::meter_req_l() const
+{
+  Meter_change_req *m_l=0;
+  for (int i=0; !m_l && i < timing_req_l_arr_.size (); i++) 
+    {
+      m_l=timing_req_l_arr_[i]->meterchange();
+    }
+  return m_l;  
+}
+
+void
+Timing_engraver::do_process_requests()
+{
+  for (int i=0; i < timing_req_l_arr_.size (); i++) 
+    {
+      Timing_req * tr_l = timing_req_l_arr_[i];
+      Meter_change_req *m_l = tr_l->meterchange();
+      if (m_l) 
+	{
+	  int b_i= m_l->beats_i_;
+	  int o_i = m_l->one_beat_i_;
+	  if (! time_.allow_meter_change_b())
+	    tr_l->warning ("Meter change not allowed here");
+	  else
+	    {
+	      time_.set_meter (b_i, o_i);
+	      default_grouping_ = 
+		Rhythmic_grouping (MInterval (0,Moment (b_i, o_i)), b_i);
+	    }
+	}
+      else if (tr_l->partial()) 
+	{
+	  Moment m = tr_l->partial()->duration_;
+	  String error = time_.try_set_partial_str (m);
+	  if (error != "") 
+	    {
+	      tr_l->warning (error);
+	    }
+	  else 
+	    time_.setpartial (m);
+	}
+      else if (tr_l->barcheck()) 
+	{
+	  if (time_.whole_in_measure_) 
+	    {
+	      tr_l ->warning ("Barcheck failed");
+	    
+	      time_.whole_in_measure_ = 0; // resync
+	      time_.error_b_ = true;
+	    }
+
+	}
+      else if (tr_l->cadenza()) 
+	{
+	  time_.set_cadenza (tr_l->cadenza()->on_b_);
+
+	}
+      else if (tr_l->measuregrouping()) 
+	{
+	  default_grouping_ = 
+	    parse_grouping (tr_l->measuregrouping()->beat_i_arr_,
+			    tr_l->measuregrouping()->elt_length_arr_);
+
+	}
+    }
+}
+
+
+void
+Timing_engraver::do_pre_move_processing()
+{
+  timing_req_l_arr_.set_size (0);
+  Engraver_group_engraver * grav_l = daddy_grav_l_;
+  while (grav_l->daddy_grav_l_) 
+    {
+      grav_l = grav_l->daddy_grav_l_;
+    }
+  
+  assert (grav_l->name() == Score_engraver::static_name ());
+  if (!time_.cadenza_b_)
+    ((Score_engraver*)grav_l)->add_moment_to_process (time_.next_bar_moment());
+}
+
+IMPLEMENT_IS_TYPE_B1(Timing_engraver, Engraver);
+ADD_THIS_ENGRAVER(Timing_engraver);
+
+void
+Timing_engraver::do_creation_processing()
+{
+  time_.when_ = get_staff_info().when ();
+}
+
+void
+Timing_engraver::do_post_move_processing()
+{
+  time_.add (get_staff_info().when ()  - time_.when_);
+}
 
-#endif