lilypond-0.0.64

diff --git a/lily/stem-beam-reg.cc b/lily/stem-beam-reg.cc
index 95f8979803354f6189207bcc414074f3e4e490c1..63040205007bfe3ce3cae94da855a9f49dafe77d 100644 (file)
--- a/lily/stem-beam-reg.cc
+++ b/lily/stem-beam-reg.cc
@@ -97,19 +97,19 @@ Stem_beam_register::process_requests()
            stem_p_->print_flag_b_ = true;
        }
        
-       announce_element(Staff_elem_info(stem_p_, stem_req_l_));
+       announce_element(Score_elem_info(stem_p_, stem_req_l_));
     }
 }
 
 void
-Stem_beam_register::acknowledge_element(Staff_elem_info info)
+Stem_beam_register::acknowledge_element(Score_elem_info info)
 {
     if (!stem_p_)
        return;
 
     if (info.elem_l_->name() == Notehead::static_name() &&
        stem_req_l_->duration() == info.req_l_->rhythmic()->duration()){
-       Notehead * n_l= (Notehead*)info.elem_l_;
+       Notehead * n_l= (Notehead*)info.elem_l_->item();
        stem_p_->add(n_l);
     }
 }

diff --git a/lily/tie-reg.cc b/lily/tie-reg.cc
index c1c5b0bc837d452f455cebce480bebea5b2d09e7..3d75818870bfc4f5ab8ed16d1609963302312ccd 100644 (file)
--- a/lily/tie-reg.cc
+++ b/lily/tie-reg.cc
@@ -71,19 +71,19 @@ Tie_register::process_requests()
 }
 
 void
-Tie_register::acknowledge_element(Staff_elem_info i)
+Tie_register::acknowledge_element(Score_elem_info i)
 {
     if (i.elem_l_->name() == Notehead::static_name()) {
        if (tie_p_) {
-           tie_p_->set_head(-1, (Notehead*)i.elem_l_);
+           tie_p_->set_head(-1, (Notehead*)i.elem_l_->item());
            melodic_req_l_ = i.req_l_->musical()->melodic();
        }
 
        if (end_tie_p_) {
-           end_tie_p_->set_head(1, (Notehead*)i.elem_l_);
+           end_tie_p_->set_head(1, (Notehead*)i.elem_l_->item());
            if (!Melodic_req::compare ( *end_melodic_req_l_, *melodic_req_l_))
                end_tie_p_->same_pitch_b_ = true;
-           announce_element(Staff_elem_info(end_tie_p_,end_req_l_));
+           announce_element(Score_elem_info(end_tie_p_,end_req_l_));
        }
     }
 }