* The grand 2005-2006 replace.

[lilypond.git] / lily / include / global-context.hh

diff --git a/lily/include/global-context.hh b/lily/include/global-context.hh
index a51859f3a5e9d6850b78eed0d774c9549b6ba4b7..515c7c3266070a28ea7e9a34af8f36982448d468 100644 (file)
--- a/lily/include/global-context.hh
+++ b/lily/include/global-context.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef GLOBAL_CONTEXT_HH
@@ -17,6 +17,8 @@ class Global_context : public virtual Context
   PQueue<Moment> extra_mom_pq_;
   Output_def *output_def_;
 
+  DECLARE_CLASSNAME(Global_context);
+
   friend class Output_def;
 public:
   Global_context (Output_def *, Moment final, Object_key *key);
@@ -29,7 +31,7 @@ public:
   void apply_finalizations ();
   void add_finalization (SCM);
 
-  virtual Music_output *get_output ();
+  virtual SCM get_output ();
   virtual void prepare (Moment);
   virtual void one_time_step ();
   virtual void finish ();
@@ -44,6 +46,6 @@ protected:
   Moment now_mom_;
 };
 
-SCM ly_format_output (SCM, SCM);
+SCM ly_format_output (SCM);
 
 #endif // GLOBAL_CONTEXT_HH