patch::: 1.3.86.jcn1

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

diff --git a/lily/include/simultaneous-music-iterator.hh b/lily/include/simultaneous-music-iterator.hh
index 6c4008a95b619682a50f72b28dab0fde8ba7a28d..26666c339ccf934482c12e2f42e7909518ab3748 100644 (file)
--- a/lily/include/simultaneous-music-iterator.hh
+++ b/lily/include/simultaneous-music-iterator.hh
@@ -9,22 +9,27 @@
 
 #ifndef SIMULTANEOUS_MUSIC_ITERATOR_HH
 #define SIMULTANEOUS_MUSIC_ITERATOR_HH
+
 #include "music-iterator.hh"
 #include "cons.hh"
 
 class Simultaneous_music_iterator : public Music_iterator
 {
 public:
+  VIRTUAL_COPY_CONS (Music_iterator);
+  Simultaneous_music_iterator ();
+  Simultaneous_music_iterator (Simultaneous_music_iterator const&);
+  virtual ~Simultaneous_music_iterator ();
 
   /// make a new context for every child.
   bool separate_contexts_b_;
-  
-  Simultaneous_music_iterator ();
-  virtual ~Simultaneous_music_iterator ();
+  int cursor_i_;
 
   virtual void construct_children ();
   virtual Moment next_moment () const;
   virtual bool ok () const;
+  virtual bool next ();
+  virtual Music* get_music ();
 
 protected:
   virtual void do_print () const;