release: 0.0.71pre

[lilypond.git] / lily / dynamic-reg.cc

diff --git a/lily/dynamic-reg.cc b/lily/dynamic-reg.cc
index 11a74756a7f4563d225984adef7f618b0f6dcc7f..3e953a651959af05f95d8e0501e22471526d61f0 100644 (file)
--- a/lily/dynamic-reg.cc
+++ b/lily/dynamic-reg.cc
@@ -1,7 +1,7 @@
 /*
   dynamic-reg.cc -- implement Dynamic_register
 
-  source file of the LilyPond music typesetter
+  source file of the GNU LilyPond music typesetter
 
   (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 */
@@ -19,20 +19,20 @@
 Dynamic_register::Dynamic_register()
 {
     dir_i_ =0;
-    post_move_processing();
+    do_post_move_processing();
     dynamic_p_ =0;
     to_end_cresc_p_ = cresc_p_ = 0;
     cresc_req_l_ = 0;
 }
 
 void
-Dynamic_register::post_move_processing()
+Dynamic_register::do_post_move_processing()
 {
     dynamic_req_l_arr_.set_size(0);
 }
 
 bool    
-Dynamic_register::try_request(Request * r)
+Dynamic_register::do_try_request(Request * r)
 {
     Musical_req * m = r->musical();
     if (!m || !m->dynamic())
@@ -41,7 +41,7 @@ Dynamic_register::try_request(Request * r)
     return true;
 }
 void
-Dynamic_register::process_requests()
+Dynamic_register::do_process_requests()
 {
     Crescendo*  new_cresc_p=0; 
     for (int i=0; i < dynamic_req_l_arr_.size(); i++) {
@@ -58,7 +58,7 @@ Dynamic_register::process_requests()
            assert (!dynamic_p_) ; // TODO
                
            dynamic_p_ = new Text_item(td_p);
-           announce_element(Staff_elem_info(dynamic_p_, dreq_l));
+           announce_element(Score_elem_info(dynamic_p_, dreq_l));
        } else if (dreq_l->span_dynamic()) {
 
            Span_dynamic_req* span_l = dreq_l->span_dynamic();
@@ -75,7 +75,7 @@ Dynamic_register::process_requests()
                assert(!new_cresc_p);
                new_cresc_p  = new Crescendo;
                new_cresc_p->grow_dir_i_ = span_l->dynamic_dir_i_;
-               announce_element(Staff_elem_info(new_cresc_p, span_l));
+               announce_element(Score_elem_info(new_cresc_p, span_l));
            }
        }
     }
@@ -90,7 +90,7 @@ Dynamic_register::process_requests()
 }
 
 void
-Dynamic_register::pre_move_processing()
+Dynamic_register::do_pre_move_processing()
 {
     Staff_symbol* s_l = get_staff_info().staff_sym_l_;
     if (dynamic_p_) {
@@ -109,13 +109,6 @@ Dynamic_register::pre_move_processing()
     }
 }
 
-bool
-Dynamic_register::acceptable_request_b(Request*r)const
-{
-    Musical_req * m = r->musical();
-    return  (m && m->dynamic());
-}
-
 void
 Dynamic_register::set_feature(Feature i)
 {
@@ -124,6 +117,7 @@ Dynamic_register::set_feature(Feature i)
 }
 
 IMPLEMENT_STATIC_NAME(Dynamic_register);
+IMPLEMENT_IS_TYPE_B1(Dynamic_register,Request_register);
 ADD_THIS_REGISTER(Dynamic_register);
 
 Dynamic_register::~Dynamic_register()
@@ -136,7 +130,7 @@ Dynamic_register::~Dynamic_register()
     delete cresc_p_;
 }
 void
-Dynamic_register::acknowledge_element(Staff_elem_info i)
+Dynamic_register::acknowledge_element(Score_elem_info i)
 {
     if (i.elem_l_->name() == Note_column::static_name()) {
        if (dynamic_p_) dynamic_p_->add_support(i.elem_l_);