Run `make grand-replace'.

[lilypond.git] / lily / audio-element-info.cc

diff --git a/lily/audio-element-info.cc b/lily/audio-element-info.cc
index fcd1073e14701e4b7ad0f676f59ac6403c81150b..9846ba54369742a8f3c355081684f09601b5d448 100644 (file)
--- 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--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "audio-element-info.hh"
+
 #include "translator-group.hh"
+#include "context.hh"
 
-Audio_element_info::Audio_element_info (Audio_element*s_l, Music *r_l)
+Audio_element_info::Audio_element_info (Audio_element *s, Stream_event *r)
 {
-  elem_l_ = s_l;
-  origin_trans_l_ =0;
-  req_l_ = r_l;
+  elem_ = s;
+  origin_trans_ = 0;
+  event_ = r;
 }
 
-
 Audio_element_info::Audio_element_info ()
 {
-  elem_l_ = 0;
-  req_l_ = 0;
-  origin_trans_l_ =0;
+  elem_ = 0;
+  event_ = 0;
+  origin_trans_ = 0;
 }
 
-
-Link_array<Translator>
-Audio_element_info::origin_trans_l_arr (Translator* end) const
+vector<Context*>
+Audio_element_info::origin_contexts (Translator *end) const
 {
-  Translator * t = origin_trans_l_;
-  Link_array<Translator> r;
-  do {
-    r.push (t);
-    t = t->daddy_trans_l_;
-  } while (t && t != end->daddy_trans_l_);
-  
+  Context *t = origin_trans_->context ();
+  vector<Context*> r;
+  do
+    {
+      r.push_back (t);
+      t = t->get_parent_context ();
+    }
+  while (t && t != end->context ());
+
   return r;
 }