* scm/stencil.scm (fontify-text): reinstate function

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

diff --git a/lily/audio-element-info.cc b/lily/audio-element-info.cc
index b3505fb882c351e7b53e8a85dbfd4e9ce5d96ce0..55bd91e29ebb09f2df0b99bf72c5428846a5c8d3 100644 (file)
--- a/lily/audio-element-info.cc
+++ b/lily/audio-element-info.cc
@@ -3,37 +3,38 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.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, Music *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
+Link_array<Context>
+Audio_element_info::origin_contexts (Translator* end) const
 {
-  Translator * t = origin_trans_l_;
-  Link_array<Translator> r;
+  Context * t = origin_trans_->context ();
+  Link_array<Context> r;
   do {
     r.push (t);
-    t = t->daddy_trans_l_;
-  } while (t && t != end->daddy_trans_l_);
+    t = t->get_parent_context ();
+  } while (t && t != end->context ());
   
   return r;
 }