release: 1.3.89

[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 60cbebc8fc47b4d3754baa0d43c9fc91c4ac4848..32a6bc951c5f9da369573d112043801d9543d545 100644 (file)
--- a/lily/include/part-combine-music-iterator.hh
+++ b/lily/include/part-combine-music-iterator.hh
@@ -15,25 +15,31 @@
 class Part_combine_music_iterator : public Music_iterator
 {
 public:
+  VIRTUAL_COPY_CONS (Music_iterator);
   Part_combine_music_iterator ();
 
+  enum State { UNKNOWN, UNRELATED=1, SOLO1=2, SOLO2=4, UNIRHYTHM=8, UNISON=16, UNISILENCE=32, SPLIT_INTERVAL=64 };
+ 
 protected:
+  virtual ~Part_combine_music_iterator ();
+
   virtual void construct_children ();
-  virtual Moment next_moment () const;
-  virtual void do_process_and_next (Moment);
+  virtual Moment pending_moment () const;
+  virtual void process (Moment);
+  virtual SCM get_music (Moment)const;
   virtual Music_iterator *try_music_in_children (Music *) const;
-
   virtual bool ok () const;
-  virtual void do_print () const;
-  virtual ~Part_combine_music_iterator ();
 
 private:
   void change_to (Music_iterator*, String, String);
+  int get_state (Moment m);
 
   Music_iterator * first_iter_p_;
   Music_iterator * second_iter_p_;
-
-  bool combined_b_;
+  Moment first_until_;
+  Moment second_until_;
+  int state_;
+  String suffix_;
 };
 
 #endif /* PART_COMBINE_MUSIC_ITERATOR_HH */