X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Faudio-element-info.cc;h=bcae088b678bca9f3c4dfeda561d5f26c8bd6426;hb=6acb7bac6eb134be8905b77661b6e7205bfcf48c;hp=e0384c2087ea22eea87e58b85c7a0a9f1bb9ae16;hpb=163225c0cbb1055dfd3614615350ab9f3aaba74c;p=lilypond.git diff --git a/lily/audio-element-info.cc b/lily/audio-element-info.cc index e0384c2087..bcae088b67 100644 --- a/lily/audio-element-info.cc +++ b/lily/audio-element-info.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2004 Han-Wen Nienhuys + (c) 1997--2007 Han-Wen Nienhuys */ #include "audio-element-info.hh" @@ -11,14 +11,13 @@ #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; event_ = r; } - Audio_element_info::Audio_element_info () { elem_ = 0; @@ -26,16 +25,17 @@ Audio_element_info::Audio_element_info () 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; }