X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Faudio-element-info.cc;h=c3cda8b40eafefeb7bbd0b2989ea5b8001069440;hb=6fcbb243f3c1106eb10e97fa1d8bcf74752748f9;hp=55bd91e29ebb09f2df0b99bf72c5428846a5c8d3;hpb=3e07faa176c300184b2e41d0dcfa779360519359;p=lilypond.git diff --git a/lily/audio-element-info.cc b/lily/audio-element-info.cc index 55bd91e29e..c3cda8b40e 100644 --- a/lily/audio-element-info.cc +++ b/lily/audio-element-info.cc @@ -3,38 +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_contexts (Translator* end) const +vector +Audio_element_info::origin_contexts (Translator *end) const { - Context * t = origin_trans_->context (); - Link_array r; - do { - r.push (t); - t = t->get_parent_context (); - } while (t && t != end->context ()); - + Context *t = origin_trans_->context (); + vector r; + do + { + r.push_back (t); + t = t->get_parent_context (); + } + while (t && t != end->context ()); + return r; }