X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Faudio-element-info.cc;h=c3cda8b40eafefeb7bbd0b2989ea5b8001069440;hb=e83d4d449bbb7d775b4ef1058b963fa236ba1048;hp=9a079a1425a27213708654b4fc4b81c4fa691848;hpb=7e72a1e50e94a7f9738d62599de79fe7745f600c;p=lilypond.git diff --git a/lily/audio-element-info.cc b/lily/audio-element-info.cc index 9a079a1425..c3cda8b40e 100644 --- a/lily/audio-element-info.cc +++ b/lily/audio-element-info.cc @@ -3,37 +3,39 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2004 Han-Wen Nienhuys + (c) 1997--2009 Han-Wen Nienhuys */ #include "audio-element-info.hh" + #include "translator-group.hh" +#include "context.hh" -Audio_element_info::Audio_element_info (Audio_element*s, Music *r) +Audio_element_info::Audio_element_info (Audio_element *s, Stream_event *r) { elem_ = s; - origin_trans_ =0; + origin_trans_ = 0; event_ = r; } - Audio_element_info::Audio_element_info () { elem_ = 0; event_ = 0; - origin_trans_ =0; + origin_trans_ = 0; } - -Link_array -Audio_element_info::origin_transes (Translator* end) const +vector +Audio_element_info::origin_contexts (Translator *end) const { - Translator * t = origin_trans_; - Link_array r; - do { - r.push (t); - t = t->daddy_trans_; - } while (t && t != end->daddy_trans_); - + Context *t = origin_trans_->context (); + vector r; + do + { + r.push_back (t); + t = t->get_parent_context (); + } + while (t && t != end->context ()); + return r; }