X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fsimultaneous-music-iterator.hh;h=c8766cd77cd280f4f5c1bcef226d4fcb1885499f;hb=1daa96e1881e50d9abcca1f8f81cd7259da30ab6;hp=8d25491da1e450ec0924fc92c403003cb72d7cde;hpb=a6ee9dcd388111e842064a8d46ab06c4897a00d2;p=lilypond.git

diff --git a/lily/include/simultaneous-music-iterator.hh b/lily/include/simultaneous-music-iterator.hh
index 8d25491da1..c8766cd77c 100644
--- a/lily/include/simultaneous-music-iterator.hh
+++ b/lily/include/simultaneous-music-iterator.hh
@@ -1,43 +1,51 @@
 /*
-  simultaneous-music-iterator.hh -- declare Simultaneous_music_iterator
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.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 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 ();
-  static SCM constructor_cxx_function;
-  
+  Simultaneous_music_iterator (Simultaneous_music_iterator const &);
+  virtual void derived_substitute (Context *f, Context *t);
+  virtual void derived_mark () const;
+  DECLARE_SCHEME_CALLBACK (constructor, ());
+  DECLARE_CLASSNAME (Simultaneous_music_iterator);
+
   /// make a new context for every child.
-  bool separate_contexts_b_;
-  int cursor_;
+  bool create_separate_contexts_;
 
   virtual void construct_children ();
   virtual Moment pending_moment () const;
+  virtual void do_quit ();
   virtual bool ok () const;
-  virtual SCM get_pending_events (Moment)const;
-  virtual void skip (Moment);
+  virtual bool run_always () const;
 
 protected:
   virtual void process (Moment);
-  virtual Music_iterator *try_music_in_children (Music *) const;
 
 private:
-  Cons_list<Music_iterator> children_p_list_;
+  SCM children_list_;
 };
 
 #endif // SIMULTANEOUS_MUSIC_ITERATOR_HH