#include "music-iterator.hh"
#include "music-sequence.hh"
#include "warn.hh"
-
-enum Outlet_type
-{
- CONTEXT_ONE, CONTEXT_TWO,
- CONTEXT_SHARED, CONTEXT_SOLO,
- CONTEXT_NULL, NUM_OUTLETS
-};
-
-static const char *outlet_names_[NUM_OUTLETS]
- = {"one", "two", "shared", "solo", "null"};
+#include "lily-imports.hh"
class Part_combine_iterator : public Music_iterator
{
virtual bool ok () const;
private:
- Music_iterator *first_iter_;
- Music_iterator *second_iter_;
- Moment start_moment_;
-
- SCM split_list_;
+ static const size_t NUM_PARTS = 2;
+ Music_iterator *iterators_[NUM_PARTS];
Stream_event *mmrest_event_;
- enum Status
- {
- APART,
- TOGETHER,
- SOLO,
- UNISONO,
- UNISILENCE,
- };
- Status state_;
-
- // For states in which it matters, this is the relevant part,
- // e.g. 1 for Solo I, 2 for Solo II.
- int chosen_part_;
-
- /*
- TODO: this is getting off hand...
- */
- Context_handle handles_[NUM_OUTLETS];
-
- void substitute_both (Outlet_type to1,
- Outlet_type to2);
- void kill_mmrest_in_inactive_outlets ();
- /* parameter is really Outlet_type */
- void kill_mmrest (int in);
- void chords_together ();
- void solo1 ();
- void solo2 ();
- void apart ();
- void unisono (bool silent, int newpart);
+ bool is_active_outlet (const Context *c) const;
+ void kill_mmrest (Context *c);
};
+const size_t Part_combine_iterator::NUM_PARTS;
+
void
Part_combine_iterator::do_quit ()
{
- if (first_iter_)
- first_iter_->quit ();
- if (second_iter_)
- second_iter_->quit ();
+ for (size_t i = 0; i < NUM_PARTS; i++)
+ if (iterators_[i])
+ iterators_[i]->quit ();
}
Part_combine_iterator::Part_combine_iterator ()
{
mmrest_event_ = 0;
- first_iter_ = 0;
- second_iter_ = 0;
- split_list_ = SCM_EOL;
- state_ = APART;
- chosen_part_ = 1;
+ for (size_t i = 0; i < NUM_PARTS; i++)
+ iterators_[i] = 0;
}
void
Part_combine_iterator::derived_mark () const
{
- if (first_iter_)
- scm_gc_mark (first_iter_->self_scm ());
- if (second_iter_)
- scm_gc_mark (second_iter_->self_scm ());
+ for (size_t i = 0; i < NUM_PARTS; i++)
+ if (iterators_[i])
+ scm_gc_mark (iterators_[i]->self_scm ());
+
if (mmrest_event_)
scm_gc_mark (mmrest_event_->self_scm ());
}
Part_combine_iterator::derived_substitute (Context *f,
Context *t)
{
- if (first_iter_)
- first_iter_->substitute_outlet (f, t);
+ // (Explain why just iterators_[0].)
+ if (iterators_[0])
+ iterators_[0]->substitute_outlet (f, t);
}
Moment
{
Moment p;
p.set_infinite (1);
- if (first_iter_->ok ())
- p = min (p, first_iter_->pending_moment ());
- if (second_iter_->ok ())
- p = min (p, second_iter_->pending_moment ());
+ for (size_t i = 0; i < NUM_PARTS; i++)
+ if (iterators_[i]->ok ())
+ p = min (p, iterators_[i]->pending_moment ());
+
return p;
}
bool
Part_combine_iterator::ok () const
{
- return first_iter_->ok () || second_iter_->ok ();
-}
+ for (size_t i = 0; i < NUM_PARTS; i++)
+ if (iterators_[i]->ok ())
+ return true;
-void
-Part_combine_iterator::substitute_both (Outlet_type to1,
- Outlet_type to2)
-{
- first_iter_->substitute_outlet (first_iter_->get_outlet (),
- handles_[to1].get_context ());
- second_iter_->substitute_outlet (second_iter_->get_outlet (),
- handles_[to2].get_context ());
+ return false;
}
-void Part_combine_iterator::kill_mmrest_in_inactive_outlets ()
+bool Part_combine_iterator::is_active_outlet (const Context *c) const
{
- for (int j = 0; j < NUM_OUTLETS; j++)
- {
- Context *c = handles_[j].get_context ();
+ for (size_t i = 0; i < NUM_PARTS; i++)
+ if (iterators_[i] && (iterators_[i]->get_outlet () == c))
+ return true;
- if (first_iter_->get_outlet () == c)
- continue;
-
- if (second_iter_->get_outlet () == c)
- continue;
-
- kill_mmrest (j);
- }
+ return false;
}
void
-Part_combine_iterator::kill_mmrest (int in)
+Part_combine_iterator::kill_mmrest (Context *c)
{
if (!mmrest_event_)
{
mmrest_event_ = new Stream_event
- (scm_call_1 (ly_lily_module_constant ("ly:make-event-class"),
- ly_symbol2scm ("multi-measure-rest-event")));
+ (Lily::ly_make_event_class (ly_symbol2scm ("multi-measure-rest-event")));
mmrest_event_->set_property ("duration", SCM_EOL);
mmrest_event_->unprotect ();
}
- handles_[in].get_context ()->event_source ()->broadcast (mmrest_event_);
-}
-
-void
-Part_combine_iterator::unisono (bool silent, int newpart)
-{
- Status newstate = (silent) ? UNISILENCE : UNISONO;
-
- if ((newstate == state_) and (newpart == chosen_part_))
- return;
- else
- {
- Outlet_type c1 = (newpart == 2) ? CONTEXT_NULL : CONTEXT_SHARED;
- Outlet_type c2 = (newpart == 2) ? CONTEXT_SHARED : CONTEXT_NULL;
- substitute_both (c1, c2);
-
- state_ = newstate;
- chosen_part_ = newpart;
- }
-}
-
-void
-Part_combine_iterator::solo1 ()
-{
- if ((state_ == SOLO) && (chosen_part_ == 1))
- return;
- else
- {
- state_ = SOLO;
- chosen_part_ = 1;
- substitute_both (CONTEXT_SOLO, CONTEXT_NULL);
- }
-}
-
-void
-Part_combine_iterator::solo2 ()
-{
- if ((state_ == SOLO) and (chosen_part_ == 2))
- return;
- else
- {
- state_ = SOLO;
- chosen_part_ = 2;
- substitute_both (CONTEXT_NULL, CONTEXT_SOLO);
- }
-}
-
-void
-Part_combine_iterator::chords_together ()
-{
- if (state_ == TOGETHER)
- return;
- else
- {
- state_ = TOGETHER;
-
- substitute_both (CONTEXT_SHARED, CONTEXT_SHARED);
- }
-}
-
-void
-Part_combine_iterator::apart ()
-{
- if (state_ == APART)
- return;
- else
- {
- state_ = APART;
- substitute_both (CONTEXT_ONE, CONTEXT_TWO);
- }
+ c->event_source ()->broadcast (mmrest_event_);
}
void
Part_combine_iterator::construct_children ()
{
- start_moment_ = get_outlet ()->now_mom ();
- split_list_ = get_music ()->get_property ("split-list");
-
- Context *c = get_outlet ();
-
- for (int i = 0; i < NUM_OUTLETS; i++)
- {
- SCM type = (i == CONTEXT_NULL) ? ly_symbol2scm ("Devnull") : ly_symbol2scm ("Voice");
- /* find context below c: otherwise we may create new staff for each voice */
- c = c->find_create_context (type, outlet_names_[i], SCM_EOL);
- handles_[i].set_context (c);
- }
-
SCM lst = get_music ()->get_property ("elements");
- Context *one = handles_[CONTEXT_ONE].get_context ();
- set_context (one);
- first_iter_ = unsmob<Music_iterator> (get_iterator (unsmob<Music> (scm_car (lst))));
- Context *two = handles_[CONTEXT_TWO].get_context ();
- set_context (two);
- second_iter_ = unsmob<Music_iterator> (get_iterator (unsmob<Music> (scm_cadr (lst))));
- Context *shared = handles_[CONTEXT_SHARED].get_context ();
- set_context (shared);
+ iterators_[0] = unsmob<Music_iterator> (get_iterator (unsmob<Music> (scm_car (lst))));
+ iterators_[1] = unsmob<Music_iterator> (get_iterator (unsmob<Music> (scm_cadr (lst))));
}
void
Part_combine_iterator::process (Moment m)
{
- Moment now = get_outlet ()->now_mom ();
- Moment *splitm = 0;
+ Context *prev_active_outlets[NUM_PARTS];
+ bool any_outlet_changed = false;
+ for (size_t i = 0; i < NUM_PARTS; i++)
+ {
+ prev_active_outlets[i] = iterators_[i]->get_outlet ();
- /* This is needed if construct_children was called before iteration
- started */
- if (start_moment_.main_part_.is_infinity () && start_moment_ < 0)
- start_moment_ = now;
+ if (iterators_[i]->ok ())
+ iterators_[i]->process (m);
+
+ if (prev_active_outlets[i] != iterators_[i]->get_outlet ())
+ any_outlet_changed = true;
+ }
- for (; scm_is_pair (split_list_); split_list_ = scm_cdr (split_list_))
+ if (any_outlet_changed)
{
- splitm = unsmob<Moment> (scm_caar (split_list_));
- if (splitm && *splitm + start_moment_ > now)
- break;
-
- SCM tag = scm_cdar (split_list_);
-
- Context *outletsBefore[] = { first_iter_->get_outlet (),
- second_iter_->get_outlet () };
-
- if (scm_is_eq (tag, ly_symbol2scm ("chords")))
- chords_together ();
- else if (scm_is_eq (tag, ly_symbol2scm ("apart"))
- || scm_is_eq (tag, ly_symbol2scm ("apart-silence"))
- || scm_is_eq (tag, ly_symbol2scm ("apart-spanner")))
- apart ();
- else if (scm_is_eq (tag, ly_symbol2scm ("unisono")))
+ // Kill multi-measure rests in outlets that were previously active and
+ // are no longer active.
+ for (size_t i = 0; i < NUM_PARTS; i++)
{
- // Continue to use the most recently used part because we might have
- // killed mmrests in the other part.
- unisono (false, (chosen_part_ == 2) ? 2 : 1);
+ Context *c = prev_active_outlets[i];
+ if (c && !is_active_outlet (c))
+ kill_mmrest (c);
}
- else if (scm_is_eq (tag, ly_symbol2scm ("unisilence")))
- {
- // as for unisono
- unisono (true, (chosen_part_ == 2) ? 2 : 1);
- }
- else if (scm_is_eq (tag, ly_symbol2scm ("silence1")))
- unisono (true, 1);
- else if (scm_is_eq (tag, ly_symbol2scm ("silence2")))
- unisono (true, 2);
- else if (scm_is_eq (tag, ly_symbol2scm ("solo1")))
- solo1 ();
- else if (scm_is_eq (tag, ly_symbol2scm ("solo2")))
- solo2 ();
- else if (scm_is_symbol (tag))
- {
- string s = "Unknown split directive: "
- + (scm_is_symbol (tag) ? ly_symbol2string (tag) : string ("not a symbol"));
- programming_error (s);
- }
-
- if ((first_iter_->get_outlet () != outletsBefore[0])
- || (second_iter_->get_outlet () != outletsBefore[1]))
- kill_mmrest_in_inactive_outlets ();
}
-
- if (first_iter_->ok ())
- first_iter_->process (m);
-
- if (second_iter_->ok ())
- second_iter_->process (m);
}
IMPLEMENT_CTOR_CALLBACK (Part_combine_iterator);
projects / lilypond.git / blobdiff