* lily/ various: Introduce stream events of types Prepare,

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

diff --git a/lily/include/global-context.hh b/lily/include/global-context.hh
index cc87ff3c9bb3e18fcca49c55144355962f219119..0ff225c50d38ec96e5385de723a09d6e9e0d5091 100644 (file)
--- a/lily/include/global-context.hh
+++ b/lily/include/global-context.hh
@@ -16,13 +16,12 @@ 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 *, Object_key *key);
   int get_moments_left () const;
   Moment sneaky_insert_extra_moment (Moment);
   void add_moment_to_process (Moment);
@@ -32,18 +31,16 @@ public:
   void apply_finalizations ();
   void add_finalization (SCM);
 
-  virtual SCM get_output ();
-  virtual void prepare (Moment);
+  DECLARE_LISTENER (prepare);
   virtual void one_time_step ();
   virtual void finish ();
+  virtual SCM get_output ();
   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_;
 };