release: 1.2.15

[lilypond.git] / lily / music-iterator.cc

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