X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fdynamic-align-engraver.cc;h=df5c24cb330afd78c3632f8489a9ad096e3255ff;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=35083db04344930d31cf19abb37582b712fe4a30;hpb=c39d188d28fdc84cef8cbaea7b8d6e2fb718c30f;p=lilypond.git

diff --git a/lily/dynamic-align-engraver.cc b/lily/dynamic-align-engraver.cc
index 35083db043..df5c24cb33 100644
--- a/lily/dynamic-align-engraver.cc
+++ b/lily/dynamic-align-engraver.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2008--2014 Han-Wen Nienhuys <hanwen@lilypond.org>
+  Copyright (C) 2008--2015 Han-Wen Nienhuys <hanwen@lilypond.org>
 
 
   LilyPond is free software: you can redistribute it and/or modify
@@ -44,7 +44,7 @@ protected:
   virtual void stop_translation_timestep ();
 
 private:
-  void create_line_spanner (Stream_event *cause);
+  void create_line_spanner (Grob *cause);
   void set_spanner_bounds (Spanner *line, bool end);
   Spanner *line_;
   Spanner *ended_line_; // Spanner manually broken, don't use it for new grobs
@@ -71,11 +71,10 @@ ADD_ACKNOWLEDGER (Dynamic_align_engraver, footnote_spanner);
 ADD_END_ACKNOWLEDGER (Dynamic_align_engraver, dynamic);
 
 void
-Dynamic_align_engraver::create_line_spanner (Stream_event *event)
+Dynamic_align_engraver::create_line_spanner (Grob *cause)
 {
   if (!line_)
-    line_ = make_spanner ("DynamicLineSpanner",
-                          event ? event->self_scm () : SCM_EOL);
+    line_ = make_spanner ("DynamicLineSpanner", cause->self_scm ());
 }
 
 void
@@ -141,7 +140,7 @@ Dynamic_align_engraver::acknowledge_dynamic (Grob_info info)
         }
     }
 
-  create_line_spanner (cause);
+  create_line_spanner (info.grob ());
   if (Spanner::has_interface (info.grob ()))
     {
       started_.push_back (info.spanner ());
@@ -182,7 +181,7 @@ Dynamic_align_engraver::set_spanner_bounds (Spanner *line, bool end)
             bound = spanners[0]->get_bound (d);
           else
             {
-              bound = unsmob_grob (get_property ("currentMusicalColumn"));
+              bound = Grob::unsmob (get_property ("currentMusicalColumn"));
               programming_error ("started DynamicLineSpanner but have no left bound");
             }