X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fgrace-performer-group.cc;h=fcfad2a3391a34021f08b0476d535fb173f33b98;hb=160441415ece6ea402f7af59087293d8d16c29f2;hp=65d4cdef7f0095709f6295c9cbc861d902c42205;hpb=0ac652bb955a79fcb1655a5fade88bc6e1e551c3;p=lilypond.git diff --git a/lily/grace-performer-group.cc b/lily/grace-performer-group.cc index 65d4cdef7f..fcfad2a339 100644 --- a/lily/grace-performer-group.cc +++ b/lily/grace-performer-group.cc @@ -3,12 +3,12 @@ source file of the GNU LilyPond music playter - (c) 1999 Jan Nieuwenhuizen + (c) 1999--2000 Jan Nieuwenhuizen */ #include "grace-performer-group.hh" #include "lily-guile.hh" -#include "ly-symbols.hh" + #include "audio-element.hh" ADD_THIS_TRANSLATOR (Grace_performer_group); @@ -45,13 +45,14 @@ Grace_performer_group::do_removal_processing () } void -Grace_performer_group::announce_element (Audio_element_info inf) +Grace_performer_group::announce_element (Audio_element_info info) { - announce_info_arr_.push (inf); + announce_info_arr_.push (info); // do not propagate to top - announce_to_top_.push (inf); + announce_to_top_.push (info); - //inf.elem_l_->set_elt_property (grace_scm_sym, SCM_BOOL_T); + //inf.elem_l_->set_elt_property ("grace", SCM_BOOL_T); + info.elem_l_->grace_b_ = true; } void @@ -70,7 +71,7 @@ void Grace_performer_group::process () { calling_self_b_ = true; - process_requests (); + process_music (); do_announces(); pre_move_processing(); check_removal(); @@ -99,12 +100,6 @@ Grace_performer_group::each (Const_method_pointer method) const bool Grace_performer_group::do_try_music (Music *m) { - bool hebbes_b =false; - - Link_array nongroups (nongroup_l_arr ()); - - for (int i =0; !hebbes_b && i < nongroups.size() ; i++) - hebbes_b =nongroups[i]->try_music (m); - - return hebbes_b; + return try_music_on_nongroup_children (m); } +