X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fglobal-context.hh;h=e0aca0a7d6cc35aeea203bb3c524e985eedd80ba;hb=8cf69a467ad7650f5ca9da6fe2dfd4c7c088b239;hp=cc87ff3c9bb3e18fcca49c55144355962f219119;hpb=9f3572d98bb948c9689cd1f75401a029451fa001;p=lilypond.git

diff --git a/lily/include/global-context.hh b/lily/include/global-context.hh
index cc87ff3c9b..e0aca0a7d6 100644
--- a/lily/include/global-context.hh
+++ b/lily/include/global-context.hh
@@ -1,9 +1,20 @@
 /*
-  global-context.hh -- declare Global_context
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997--2006 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
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef GLOBAL_CONTEXT_HH
@@ -12,38 +23,39 @@
 #include "context.hh"
 #include "pqueue.hh"
 
-class Global_context : public virtual Context
+struct Preinit_Global_context
 {
-  PQueue<Moment> extra_mom_pq_;
   Output_def *output_def_;
-  int unique_count_;
+  Preinit_Global_context ();
+};
+
+class Global_context : Preinit_Global_context, public Context
+{
+  PQueue<Moment> extra_mom_pq_;
+  virtual void derived_mark () const;
 
-  DECLARE_CLASSNAME(Global_context);
+  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);
 
+  void prepare (SCM);
   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 ();
+  virtual Context *get_default_interpreter (const string &context_id = "");
 
-  int new_unique ();
   Moment previous_moment () const;
 protected:
-  Moment final_mom_;
   Moment prev_mom_;
   Moment now_mom_;
 };