X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fglobal-context.hh;h=2fcbfca2982cc7ff770d9a862dd36fe43efa122a;hb=8927024a06dccf738135319434199cdba64dfab9;hp=181ee87703f19c42ab0d5af3f530553bba6081a7;hpb=e24df7c27635dc996c466295eacf2981bddccaf7;p=lilypond.git

diff --git a/lily/include/global-context.hh b/lily/include/global-context.hh
index 181ee87703..2fcbfca298 100644
--- a/lily/include/global-context.hh
+++ b/lily/include/global-context.hh
@@ -3,10 +3,9 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-
 #ifndef GLOBAL_CONTEXT_HH
 #define GLOBAL_CONTEXT_HH
 
@@ -16,36 +15,35 @@
 class Global_context : public virtual Context
 {
   PQueue<Moment> extra_mom_pq_;
-  Output_def*  output_def_;
-  
+  Output_def *output_def_;
+
+  DECLARE_CLASSNAME(Global_context);
+
   friend class Output_def;
 public:
-  Global_context (Output_def*, Moment final, Object_key *key);
+  Global_context (Output_def *);
   int get_moments_left () const;
   Moment sneaky_insert_extra_moment (Moment);
   void add_moment_to_process (Moment);
-  void run_iterator_on_me (Music_iterator*);
-  virtual Score_context*get_score_context () const;
-  
+  void run_iterator_on_me (Music_iterator *);
+  virtual Context *get_score_context () const;
+
   void apply_finalizations ();
   void add_finalization (SCM);
 
-  virtual Music_output *get_output ();     
-  virtual void prepare (Moment);
-  virtual void one_time_step ();
-  virtual void finish ();
-  virtual Output_def* get_output_def () const; 
+  DECLARE_LISTENER (prepare);
+  virtual SCM get_output ();
+  virtual Output_def *get_output_def () const;
   virtual Moment now_mom () const;
   virtual Context *get_default_interpreter ();
 
-
   Moment previous_moment () const;
 protected:
-  Moment final_mom_;
   Moment prev_mom_;
   Moment now_mom_;
 };
 
-SCM ly_format_output (SCM, SCM);
+SCM ly_format_output (SCM);
+Global_context *unsmob_global_context (SCM x);
 
 #endif // GLOBAL_CONTEXT_HH