* VERSION (MY_PATCH_LEVEL): make 1.7.0

[lilypond.git] / lily / include / part-combine-music-iterator.hh

diff --git a/lily/include/part-combine-music-iterator.hh b/lily/include/part-combine-music-iterator.hh
index 9f4799b59d2f386861e4bddaa4a9547de49d7751..fa88a2dc5ef59f1a3c1d25b931ffc3ea9048db3f 100644 (file)
--- a/lily/include/part-combine-music-iterator.hh
+++ b/lily/include/part-combine-music-iterator.hh
@@ -19,14 +19,15 @@ public:
   Part_combine_music_iterator ();
 
   enum State { UNKNOWN, UNRELATED=1, SOLO1=2, SOLO2=4, UNIRHYTHM=8, UNISON=16, UNISILENCE=32, SPLIT_INTERVAL=64 };
-  static SCM constructor_cxx_function; 
+  DECLARE_SCHEME_CALLBACK(constructor, ()); 
 protected:
-  virtual ~Part_combine_music_iterator ();
+  virtual void derived_mark () const;
   Part_combine_music_iterator (Part_combine_music_iterator const &);
   virtual void construct_children ();
   virtual Moment pending_moment () const;
+  virtual void do_quit(); 
   virtual void process (Moment);
-  virtual SCM get_music (Moment)const;
+  virtual SCM get_pending_events (Moment)const;
   virtual Music_iterator *try_music_in_children (Music *) const;
   virtual bool ok () const;
 
@@ -34,8 +35,8 @@ private:
   void change_to (Music_iterator*, String, String);
   int get_state (Moment m);
 
-  Music_iterator * first_iter_p_;
-  Music_iterator * second_iter_p_;
+  Music_iterator * first_iter_;
+  Music_iterator * second_iter_;
   Moment first_until_;
   Moment second_until_;
   int state_;