X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fglobal-context.hh;h=3872ea0f3a20d0714e84f6c582d8bfc2e3563eb0;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=cc87ff3c9bb3e18fcca49c55144355962f219119;hpb=2a8dcc4faa8a16229774d3414eedbf46feceac84;p=lilypond.git

diff --git a/lily/include/global-context.hh b/lily/include/global-context.hh
index cc87ff3c9b..3872ea0f3a 100644
--- 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--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef GLOBAL_CONTEXT_HH
@@ -16,38 +16,34 @@ class Global_context : public virtual Context
 {
   PQueue<Moment> extra_mom_pq_;
   Output_def *output_def_;
-  int unique_count_;
 
   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;
+  virtual Context *get_score_context () const;
 
   void apply_finalizations ();
   void add_finalization (SCM);
 
+  DECLARE_LISTENER (prepare);
   virtual SCM get_output ();
-  virtual void prepare (Moment);
-  virtual void one_time_step ();
-  virtual void finish ();
   virtual Output_def *get_output_def () const;
   virtual Moment now_mom () const;
   virtual Context *get_default_interpreter ();
 
-  int new_unique ();
   Moment previous_moment () const;
 protected:
-  Moment final_mom_;
   Moment prev_mom_;
   Moment now_mom_;
 };
 
 SCM ly_format_output (SCM);
+Global_context *unsmob_global_context (SCM x);
 
 #endif // GLOBAL_CONTEXT_HH