X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Faudio-element-info.cc;h=85a74cccaf47957cb4cf347c03e1b839812939e1;hb=ae2db5b21bf232f5145f3a3e091689c8fc7247e9;hp=c9f99c77323f2a36be3f04540e24e398d524b337;hpb=f1346920f64c571a1475d3ded295b9637560c6bc;p=lilypond.git

diff --git a/lily/audio-element-info.cc b/lily/audio-element-info.cc
index c9f99c7732..85a74cccaf 100644
--- a/lily/audio-element-info.cc
+++ b/lily/audio-element-info.cc
@@ -1,39 +1,52 @@
 /*
-  Audio-element-info.cc -- implement Audio_element_info
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #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()
+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;
 }