From 87b2630f1a5648868de475308d0d931cbdb3c193 Mon Sep 17 00:00:00 2001 From: fred Date: Sun, 24 Mar 2002 19:46:32 +0000 Subject: [PATCH] lilypond-0.0.71pre --- lily/clef-reg.cc | 16 ++++++---------- lily/include/interpreter.hh | 8 -------- 2 files changed, 6 insertions(+), 18 deletions(-) diff --git a/lily/clef-reg.cc b/lily/clef-reg.cc index 4e3d25eb40..3f4c311937 100644 --- a/lily/clef-reg.cc +++ b/lily/clef-reg.cc @@ -56,10 +56,9 @@ void Clef_register::acknowledge_element(Score_elem_info info) { if (info.elem_l_->name() == Bar::static_name() ) { - if (!clef_p_){ - create_clef(); + create_clef(); + if ( !clef_req_l_ ) clef_p_->default_b_ = true; - } } } @@ -79,8 +78,7 @@ Clef_register::do_try_request(Request * r_l) clef_req_l_ = creq_l->clefchange(); - // do it now! Others have to read c0_pos. - read_req(creq_l->clefchange()); + read_req(clef_req_l_); return true; } @@ -89,13 +87,11 @@ Clef_register::create_clef() { if (!clef_p_) { clef_p_ = new Clef_item; - announce_element(Score_elem_info(clef_p_, - clef_req_l_)); - - clef_p_->read(*this); + announce_element(Score_elem_info(clef_p_,clef_req_l_)); } - + clef_p_->read(*this); } + void Clef_register::do_process_requests() { diff --git a/lily/include/interpreter.hh b/lily/include/interpreter.hh index 92541c7211..6645ab0052 100644 --- a/lily/include/interpreter.hh +++ b/lily/include/interpreter.hh @@ -12,12 +12,4 @@ #include "lily-proto.hh" -class Interpreter { -public: - int music_list_i_; - Interpreter(); - virtual ~Interpreter(); - virtual bool interpret_request_b(Request*) { return false;} -}; - #endif // INTERPRETER_HH -- 2.39.5