release: 1.3.106

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

diff --git a/lily/music-iterator.cc b/lily/music-iterator.cc
index 51ae61f1ce333ff0c6bd46d767dfb3492989f3e0..08f454fae1e303b8d255c0579729d7f2876735ad 100644 (file)
--- a/lily/music-iterator.cc
+++ b/lily/music-iterator.cc
@@ -10,36 +10,27 @@
   UGH. too many includes.
  */
 #include "debug.hh"
-#include "music-list.hh"
 #include "music-iterator.hh"
 #include "property-iterator.hh"
 #include "request-chord-iterator.hh"
 #include "sequential-music-iterator.hh"
 #include "simultaneous-music-iterator.hh"
 #include "translator-group.hh"
-#include "translation-property.hh"
 #include "change-iterator.hh"
-#include "change-translator.hh"
 #include "music-wrapper.hh"
 #include "music-wrapper-iterator.hh"
 #include "time-scaled-music-iterator.hh"
-#include "time-scaled-music.hh"
-#include "context-specced-music.hh"
 #include "repeated-music.hh"
 #include "folded-repeat-iterator.hh"
 #include "unfolded-repeat-iterator.hh"
 #include "grace-iterator.hh"
-#include "grace-music.hh"
-#include "lyric-combine-music.hh"
 #include "lyric-combine-music-iterator.hh"
-#include "auto-change-music.hh"
 #include "auto-change-iterator.hh"
-#include "part-combine-music.hh"
 #include "part-combine-music-iterator.hh"
-#include "request.hh"
 #include "simple-music-iterator.hh"
-#include "output-property.hh"
+#include "output-property-music-iterator.hh"
 #include "chord-tremolo-iterator.hh"
+#include "context-specced-music.hh"
 
 Music_iterator::Music_iterator ()
 {
@@ -51,6 +42,7 @@ Music_iterator::Music_iterator (Music_iterator const& src)
   //  clone_i_ = src.clone_i_ + 1;
   handle_ = *src.handle_.clone ();
   music_l_ = src.music_l_;
+  music_length_ = src.music_length_;
 }
 
 Music_iterator::~Music_iterator ()
@@ -96,42 +88,67 @@ Music_iterator::ok () const
   return false;
 }
 
+void
+Music_iterator::skip (Moment )
+{
+}
+
 SCM
 Music_iterator::get_music (Moment)const
 {
   return SCM_EOL;
 }
 
+
+
+/* We could do this decentrally:
+
+ -  Declare a new smob-type, which stores a function ptr in its CDR
+   (and not a struct ptr). The function ptr has signature
+
+       Music_iterator* (*)()
+
+ - initialize  all music with a set_mus_property("iterator-ctor"),
+
+ - do
+ 
+    func_ptr  p = (func_ptr) gh_cdr (get_mus_property ("iterator-ctor"));
+    iter_p = (*p)();
+
+*/
+
 Music_iterator*
 Music_iterator::static_get_iterator_p (Music *m)
 {
   Music_iterator * p =0;
 
-  /* It would be nice to do this decentrally, but the order of this is
-     significant.  */
-  if (dynamic_cast<Request_chord   *> (m))
+  SCM type = m->get_mus_property ("type") ;
+
+  if (type == ly_symbol2scm ("property-set"))
+    p = new Property_iterator;
+  else if (type == ly_symbol2scm ("property-push"))
+    p = new Push_property_iterator;
+  else if (type == ly_symbol2scm ("property-pop"))
+    p = new Pop_property_iterator;
+  else if (type == ly_symbol2scm ("output-property"))
+    p = new Output_property_music_iterator;
+  else if (type == ly_symbol2scm ("request-chord"))
     p = new Request_chord_iterator;
-  else if (dynamic_cast<Lyric_combine_music *> (m))
+  else  if (type == ly_symbol2scm ("lyric-combine-music"))
     p = new Lyric_combine_music_iterator;
-  else if (dynamic_cast<Simultaneous_music *> (m)) 
+  else if  (type == ly_symbol2scm ("simultaneous-music"))
     p =  new Simultaneous_music_iterator;
-  else if (dynamic_cast<Sequential_music *> (m)) 
+  else if (type == ly_symbol2scm ("sequential-music"))
     p =  new Sequential_music_iterator;
-  else if (dynamic_cast<Translation_property *> (m))
-    p = new Property_iterator;
-  else if (dynamic_cast<Change_translator *> (m))
+  else if (type == ly_symbol2scm ("change-translator"))
     p = new Change_iterator;
-  else if (dynamic_cast<Push_translation_property*> (m))
-    p = new Push_property_iterator;
-  else if (dynamic_cast<Pop_translation_property*> (m))
-    p = new Pop_property_iterator;
-  else if (dynamic_cast<Time_scaled_music *> (m))
+  else if (type == ly_symbol2scm ("time-scaled-music"))
     p = new Time_scaled_music_iterator;
-  else if (dynamic_cast<Grace_music *> (m))
+  else if (type == ly_symbol2scm ("grace-music"))
     p = new Grace_iterator;
-  else if (dynamic_cast<Auto_change_music *> (m))
+  else if (type == ly_symbol2scm ("auto-change-music"))
     p = new Auto_change_iterator;
-  else if (dynamic_cast<Part_combine_music *> (m))
+  else if (type == ly_symbol2scm ("part-combined-music"))
     p = new Part_combine_music_iterator;
   else if (dynamic_cast<Music_wrapper   *> (m))
     p = new Music_wrapper_iterator;
@@ -150,17 +167,36 @@ Music_iterator::static_get_iterator_p (Music *m)
     }
 
   p->music_l_ = m;
+  p->music_length_ = m->length_mom ();
+  
   return p;
 }
 
+
+Moment
+Music_iterator::music_length_mom() const
+{
+  return music_length_;
+}
+
 void
 Music_iterator::init_translator (Music *m, Translator_group *report_l)
 {
   music_l_ = m;
   if (Context_specced_music * csm =dynamic_cast<Context_specced_music *> (m))
     {
-      Translator_group* a =report_l->
-       find_create_translator_l (csm->translator_type_str_, csm->translator_id_str_);
+      SCM ct = csm->get_mus_property ("context-type");
+      String c_type;
+      if (gh_string_p (ct))
+         c_type =  ly_scm2string (ct);
+      
+      String c_id;
+      SCM ci = csm->get_mus_property ("context-id");
+      if (gh_string_p (ci))
+       c_id = ly_scm2string (ci);
+      
+      Translator_group* a
+       =report_l->find_create_translator_l (c_type, c_id);
 
       set_translator (a);