Merge branch 'jneeman' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond into jneeman

[lilypond.git] / lily / grob-info.cc

diff --git a/lily/grob-info.cc b/lily/grob-info.cc
index d8471d43f76d3caa3e1ca35cc3995116294b8f48..62af8f32562a8864ceb500b69838111eb1dac592 100644 (file)
--- a/lily/grob-info.cc
+++ b/lily/grob-info.cc
@@ -6,38 +6,40 @@
   (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
+#include "context.hh"
 #include "grob-info.hh"
-#include "grob.hh"
+#include "item.hh"
 #include "music.hh"
-#include "translator-group.hh"
-#include "context.hh"
 #include "spanner.hh"
-#include "item.hh"
+#include "stream-event.hh"
+#include "translator-group.hh"
 
 Grob_info::Grob_info (Translator *t, Grob *g)
 {
   origin_trans_ = t;
   grob_ = g;
+  start_end_ = START;
 }
 
 Grob_info::Grob_info ()
 {
   grob_ = 0;
+  start_end_ = START;
   origin_trans_ = 0;
 }
 
-Music *
-Grob_info::music_cause () const
+Stream_event *
+Grob_info::event_cause () const
 {
   SCM cause = grob_->get_property ("cause");
-  return unsmob_music (cause);
+  return unsmob_stream_event (cause);
 }
 
-Link_array<Context>
+vector<Context*>
 Grob_info::origin_contexts (Translator *end) const
 {
   Context *t = origin_trans_->context ();
-  Link_array<Context> r;
+  vector<Context*> r;
   do
     {
       r.push_back (t);
@@ -66,15 +68,13 @@ Grob_info::item () const
   return dynamic_cast<Item *> (grob_);
 }
 
-Music *
-Grob_info::ultimate_music_cause () const
+Stream_event *
+Grob_info::ultimate_event_cause () const
 {
   SCM cause = grob_->self_scm ();
   while (unsmob_grob (cause))
     {
       cause = unsmob_grob (cause)->get_property ("cause");
     }
-
-  return unsmob_music (cause);
+  return unsmob_stream_event (cause);
 }
-