X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fglobal-context.cc;h=c21deb3b9ba54651c20cf21237d5ba538a249dc2;hb=65a0059b69385985896a24f407b3a791d33aef0f;hp=9168f612a94e0e2d265cafeccbfa180ec5844c75;hpb=0fe24db3936774a8fb913cb14c997036db7aeb1c;p=lilypond.git

diff --git a/lily/global-context.cc b/lily/global-context.cc
index 9168f612a9..c21deb3b9b 100644
--- a/lily/global-context.cc
+++ b/lily/global-context.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@xs4all.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
@@ -40,13 +40,13 @@ Global_context::Global_context (Output_def *o)
   prev_mom_.set_infinite (-1);
 
   /* We only need the most basic stuff to bootstrap the context tree */
-  event_source ()->add_listener (GET_LISTENER (create_context_from_event),
+  event_source ()->add_listener (GET_LISTENER (Context, create_context_from_event),
                                  ly_symbol2scm ("CreateContext"));
-  event_source ()->add_listener (GET_LISTENER (prepare),
+  event_source ()->add_listener (GET_LISTENER (Global_context, prepare),
                                  ly_symbol2scm ("Prepare"));
   events_below ()->register_as_listener (event_source_);
 
-  Context_def *globaldef = Context_def::unsmob (definition_);
+  Context_def *globaldef = unsmob<Context_def> (definition_);
   if (!globaldef)
     programming_error ("no `Global' context found");
   else
@@ -88,12 +88,11 @@ Global_context::get_moments_left () const
   return extra_mom_pq_.size ();
 }
 
-IMPLEMENT_LISTENER (Global_context, prepare);
 void
 Global_context::prepare (SCM sev)
 {
-  Stream_event *ev = Stream_event::unsmob (sev);
-  Moment *mom = Moment::unsmob (ev->get_property ("moment"));
+  Stream_event *ev = unsmob<Stream_event> (sev);
+  Moment *mom = unsmob<Moment> (ev->get_property ("moment"));
 
   assert (mom);
 
@@ -114,7 +113,7 @@ Context *
 Global_context::get_score_context () const
 {
   return (scm_is_pair (context_list_))
-         ? Context::unsmob (scm_car (context_list_))
+         ? unsmob<Context> (scm_car (context_list_))
          : 0;
 }