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 "request-iterator.hh"
-#include "output-property.hh"
+#include "simple-music-iterator.hh"
+#include "output-property-music-iterator.hh"
#include "chord-tremolo-iterator.hh"
+#include "context-specced-music.hh"
-void
-Music_iterator::do_print() const
+Music_iterator::Music_iterator ()
{
+ // clone_i_ = 0;
}
-void
-Music_iterator::print() const
-{
-#ifndef NPRINT
- if (!flower_dstream)
- return ;
- DEBUG_OUT << classname(this) << "{";
- Translator_group *t = report_to_l();
- DEBUG_OUT << "report to " << t->type_str_ << " = " << t->id_str_ << "\n";
- if (ok())
- DEBUG_OUT << "next at " << next_moment() << " ";
- else
- DEBUG_OUT << "not feeling well today..";
- do_print();
- DEBUG_OUT << "}\n";
-#endif
+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_;
}
-Translator_group*
-Music_iterator::get_req_translator_l()
+Music_iterator::~Music_iterator ()
{
- assert (report_to_l());
- if (report_to_l()->is_bottom_translator_b ())
- return report_to_l();
-
- set_translator (report_to_l()->get_default_interpreter ());
- return report_to_l();
}
+
+
Translator_group*
-Music_iterator::report_to_l() const
+Music_iterator::report_to_l () const
{
return handle_.report_to_l ();
}
void
-Music_iterator::set_translator (Translator_group*trans)
+Music_iterator::set_translator (Translator_group *trans)
{
handle_.set_translator (trans);
}
void
-Music_iterator::construct_children()
-{
-}
-
-Music_iterator::~Music_iterator()
+Music_iterator::construct_children ()
{
}
Moment
-Music_iterator::next_moment() const
+Music_iterator::pending_moment () const
{
return 0;
}
void
-Music_iterator::process_and_next (Moment m)
+Music_iterator::process (Moment)
+{
+}
+
+bool
+Music_iterator::ok () const
{
- do_process_and_next (m);
+ return false;
}
void
-Music_iterator::do_process_and_next (Moment)
+Music_iterator::skip (Moment )
{
- first_b_ = false;
}
-bool
-Music_iterator::ok() const
+SCM
+Music_iterator::get_music (Moment)const
{
- return first_b_;
+ 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::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<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;
}
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_iterator::init_translator (Music *m, Translator_group *report_l)
{
music_l_ = m;
- if (Context_specced_music * csm =dynamic_cast<Context_specced_music *>(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);
}
- if (! report_to_l())
+ if (! report_to_l ())
set_translator (report_l);
}
Music_iterator::get_iterator_p (Music *m) const
{
Music_iterator*p = static_get_iterator_p (m);
- p->init_translator (m, report_to_l());
+ p->init_translator (m, report_to_l ());
- p->construct_children();
+ p->construct_children ();
return p;
}
-Music_iterator::Music_iterator()
-{
- first_b_ = true;
-}
-
Music_iterator*
-Music_iterator::try_music (Music *m) const
+Music_iterator::try_music (Music *m) const
{
- bool b = report_to_l ()->try_music ((Music*)m); // ugh
+ bool b = report_to_l ()->try_music ( (Music*)m); // ugh
Music_iterator * it = b ? (Music_iterator*) this : 0; // ugh
if (!it)
it = try_music_in_children (m);
}
Music_iterator*
-Music_iterator::try_music_in_children (Music * ) const
+Music_iterator::try_music_in_children (Music *) const
{
return 0;
}
projects / lilypond.git / blobdiff