/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 2004--2011 Han-Wen Nienhuys
+ Copyright (C) 2004--2012 Han-Wen Nienhuys
LilyPond is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Moment start_moment_;
SCM split_list_;
+ SCM direction_;
+ SCM directionOne_;
+ SCM directionTwo_;
+ SCM horizontalShiftOne_;
+ SCM horizontalShiftTwo_;
Stream_event *unisono_event_;
Stream_event *solo_one_event_;
Status last_playing_;
/*
- TODO: this is getting of hand...
+ TODO: this is getting off hand...
*/
Context_handle handles_[NUM_OUTLETS];
// Add listeners to all contexts except Devnull.
for (int i = 0; i < NUM_OUTLETS; i++)
{
- Context *c = handles_[i].get_outlet ();
+ Context *c = handles_[i].get_context ();
if (c->is_alias (ly_symbol2scm ("Voice")))
c->event_source ()->remove_listener (GET_LISTENER (set_busy), ly_symbol2scm ("music-event"));
handles_[i].set_context (0);
first_iter_ = 0;
second_iter_ = 0;
split_list_ = SCM_EOL;
+ direction_ = SCM_BOOL_F;
+ directionOne_ = scm_from_int (1);
+ directionTwo_ = scm_from_int (-1);
+ horizontalShiftOne_ = scm_from_int (0);
+ horizontalShiftTwo_ = scm_from_int (1);
state_ = APART;
playing_state_ = APART;
+ last_playing_ = APART;
busy_ = false;
notice_busy_ = false;
if (second_iter_)
scm_gc_mark (second_iter_->self_scm ());
- Stream_event *ptrs[] =
+ Stream_event *ptrs[]
+ =
{
unisono_event_,
mmrest_event_,
{
for (int j = 0; j < NUM_OUTLETS; j++)
if (j != tos[i])
- mis[i]->substitute_outlet (handles_[j].get_outlet (), handles_[tos[i]].get_outlet ());
+ mis[i]->substitute_outlet (handles_[j].get_context (), handles_[tos[i]].get_context ());
}
for (int j = 0; j < NUM_OUTLETS; j++)
mmrest_event_->unprotect ();
}
- handles_[in].get_outlet ()->event_source ()->broadcast (mmrest_event_);
+ handles_[in].get_context ()->event_source ()->broadcast (mmrest_event_);
}
void
Outlet_type c1 = (last_playing_ == SOLO2) ? CONTEXT_NULL : CONTEXT_SHARED;
Outlet_type c2 = (last_playing_ == SOLO2) ? CONTEXT_SHARED : CONTEXT_NULL;
substitute_both (c1, c2);
- kill_mmrest ((last_playing_ == SOLO2)
- ? CONTEXT_ONE : CONTEXT_TWO);
+ kill_mmrest ((last_playing_ == SOLO2) ? CONTEXT_ONE : CONTEXT_TWO);
kill_mmrest (CONTEXT_SHARED);
if (playing_state_ != UNISONO
{
start_moment_ = get_outlet ()->now_mom ();
split_list_ = get_music ()->get_property ("split-list");
+ direction_ = get_music ()->get_property ("direction");
+ if (is_direction (direction_))
+ {
+ directionOne_ = direction_;
+ directionTwo_ = direction_;
+ if (scm_is_true (scm_negative_p (direction_)))
+ {
+ horizontalShiftOne_ = scm_from_int (1);
+ horizontalShiftTwo_ = scm_from_int (0);
+ }
+ }
Context *c = get_outlet ();
}
SCM lst = get_music ()->get_property ("elements");
- Context *one = handles_[CONTEXT_ONE].get_outlet ();
+ Context *one = handles_[CONTEXT_ONE].get_context ();
set_context (one);
first_iter_ = unsmob_iterator (get_iterator (unsmob_music (scm_car (lst))));
- Context *two = handles_[CONTEXT_TWO].get_outlet ();
+ Context *two = handles_[CONTEXT_TWO].get_context ();
set_context (two);
second_iter_ = unsmob_iterator (get_iterator (unsmob_music (scm_cadr (lst))));
+ Context *shared = handles_[CONTEXT_SHARED].get_context ();
+ set_context (shared);
/* Mimic all settings of voiceOne/voiceTwo for the two separate voices...*/
/* FIXME: Is there any way to use the definition of \voiceOne/\voiceTwo
{
SCM sym = ly_symbol2scm (*p);
execute_pushpop_property (one, sym,
- ly_symbol2scm ("direction"), scm_from_int (1));
+ ly_symbol2scm ("direction"), directionOne_);
execute_pushpop_property (two, sym,
- ly_symbol2scm ("direction"), scm_from_int (-1));
+ ly_symbol2scm ("direction"), directionTwo_);
+
+ if (scm_is_number (direction_))
+ execute_pushpop_property (shared, sym,
+ ly_symbol2scm ("direction"), direction_);
}
/* Handle horizontal shifts for crossing notes */
execute_pushpop_property (one, ly_symbol2scm ("NoteColumn"),
- ly_symbol2scm ("horizontal-shift"), scm_from_int (0));
+ ly_symbol2scm ("horizontal-shift"), horizontalShiftOne_);
execute_pushpop_property (two, ly_symbol2scm ("NoteColumn"),
- ly_symbol2scm ("horizontal-shift"), scm_from_int (1));
+ ly_symbol2scm ("horizontal-shift"), horizontalShiftTwo_);
/* Also handle MultiMeasureRest positions for voice 1/2 */
execute_pushpop_property (one, ly_symbol2scm ("MultiMeasureRest"),
ly_symbol2scm ("staff-position"), scm_from_int (4));