lilypond-1.3.0

diff --git a/lily/include/music-iterator.hh b/lily/include/music-iterator.hh
index d5ca0e0560dbea0c1c19a31d432118fe0b3bc054..f7d9c061e378160b750034b6ecfe96f8c2c7c9d0 100644 (file)
--- a/lily/include/music-iterator.hh
+++ b/lily/include/music-iterator.hh
@@ -28,8 +28,6 @@ class Music_iterator {
   Interpretation_context_handle handle_;
 
 protected:
-  bool playback_b_;            // Should use SCMs
-  
   Music const * music_l_;
 
   /// ugh. JUNKME
@@ -75,9 +73,9 @@ public:
   void set_translator (Translator_group*);
   
   /** Get an iterator matching the type of MUS, and use TRANS to find
-    an accompanying translation unit.  Repeated music can be fully
-    unfolded by setting PLAYING */
-  static Music_iterator* static_get_iterator_p (Music const* mus, bool playing);
+    an accompanying translation unit
+   */
+  static Music_iterator* static_get_iterator_p (Music const* mus);
   void init_translator (Music const *, Translator_group *); 
 
   Music_iterator();

diff --git a/lily/music-iterator.cc b/lily/music-iterator.cc
index e5774c9f32221881dc72a1b33ef83fc0e2caa5fd..9de2bb6af7819d21ab708ec25c541a744c0c259c 100644 (file)
--- a/lily/music-iterator.cc
+++ b/lily/music-iterator.cc
@@ -114,7 +114,7 @@ Music_iterator::ok() const
 }
 
 Music_iterator*
-Music_iterator::static_get_iterator_p (Music const *m, bool playing)
+Music_iterator::static_get_iterator_p (Music const *m)
 {
   Music_iterator * p =0;
 
@@ -142,15 +142,14 @@ Music_iterator::static_get_iterator_p (Music const *m, bool playing)
     p = new Music_wrapper_iterator;
   else if (Repeated_music const * n = dynamic_cast<Repeated_music const *> (m))
     {
-      if (n->fold_b_ && !playing)
+      if (n->fold_b_)
        p = new Folded_repeat_iterator;
       else
        p = new Unfolded_repeat_iterator;
     }
   else
     assert (0);
-  
-  p->playback_b_ = playing;
+
 
   p->music_l_ = m;
   return p;
@@ -177,7 +176,7 @@ Music_iterator::init_translator (Music const *m, Translator_group  *report_l)
 Music_iterator*
 Music_iterator::get_iterator_p (Music const*m) const
 {
-  Music_iterator*p = static_get_iterator_p (m, playback_b_);
+  Music_iterator*p = static_get_iterator_p (m);
   p->init_translator (m, report_to_l());
   
   p->construct_children();
@@ -186,7 +185,6 @@ Music_iterator::get_iterator_p (Music const*m) const
 
 Music_iterator::Music_iterator()
 {
-  playback_b_ = false;
   first_b_ = true;
 }
 

diff --git a/lily/simultaneous-music-iterator.cc b/lily/simultaneous-music-iterator.cc
index 7f1ff9756001fb1dd7111891046334f6da62dc82..1faaa67c13663a43eb60d64de06c0c13c034d44a 100644 (file)
--- a/lily/simultaneous-music-iterator.cc
+++ b/lily/simultaneous-music-iterator.cc
@@ -31,7 +31,7 @@ Simultaneous_music_iterator::construct_children()
   Cons<Music> *i = (sim->music_p_list_p_) ? sim->music_p_list_p_->head_ : 0;
   for (; i;  i = i->next_, j++)
     {
-      Music_iterator * mi = static_get_iterator_p (i->car_, playback_b_);
+      Music_iterator * mi = static_get_iterator_p (i->car_);
 
       /* if separate_contexts_b_ is set, create a new context with the
         number number as name */