/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 2004--2010 Han-Wen Nienhuys
+ Copyright (C) 2004--2015 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
#include "warn.hh"
enum Outlet_type
- {
- CONTEXT_ONE, CONTEXT_TWO,
- CONTEXT_SHARED, CONTEXT_SOLO,
- CONTEXT_NULL, NUM_OUTLETS
- };
+{
+ CONTEXT_ONE, CONTEXT_TWO,
+ CONTEXT_SHARED, CONTEXT_SOLO,
+ CONTEXT_NULL, NUM_OUTLETS
+};
-static const char *outlet_names_[NUM_OUTLETS] =
- {"one", "two", "shared", "solo", "null"};
+static const char *outlet_names_[NUM_OUTLETS]
+ = {"one", "two", "shared", "solo", "null"};
class Part_combine_iterator : public Music_iterator
{
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_;
Stream_event *mmrest_event_;
enum Status
- {
- APART,
- TOGETHER,
- SOLO1,
- SOLO2,
- UNISONO,
- UNISILENCE,
- };
+ {
+ APART,
+ TOGETHER,
+ SOLO1,
+ SOLO2,
+ UNISONO,
+ UNISILENCE,
+ };
Status state_;
Status playing_state_;
Status last_playing_;
/*
- TODO: this is getting of hand...
+ TODO: this is getting off hand...
*/
Context_handle handles_[NUM_OUTLETS];
void substitute_both (Outlet_type to1,
- Outlet_type to2);
+ Outlet_type to2);
/* parameter is really Outlet_type */
void kill_mmrest (int in);
// 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"));
+ c->event_source ()->remove_listener (GET_LISTENER (set_busy), ly_symbol2scm ("music-event"));
handles_[i].set_context (0);
}
}
mmrest_event_ = 0;
unisono_event_ = 0;
solo_two_event_ = 0;
- solo_one_event_= 0;
+ solo_one_event_ = 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;
}
void
scm_gc_mark (first_iter_->self_scm ());
if (second_iter_)
scm_gc_mark (second_iter_->self_scm ());
-
- Stream_event *ptrs[] = {
- unisono_event_,
- mmrest_event_,
- solo_two_event_,
- solo_one_event_,
- 0
- };
- for (int i = 0; ptrs[i]; i++)
- if (ptrs[i])
- scm_gc_mark (ptrs[i]->self_scm ());
+ if (unisono_event_)
+ scm_gc_mark (unisono_event_->self_scm ());
+ if (mmrest_event_)
+ scm_gc_mark (mmrest_event_->self_scm ());
+ if (solo_one_event_)
+ scm_gc_mark (solo_one_event_->self_scm ());
+ if (solo_two_event_)
+ scm_gc_mark (solo_two_event_->self_scm ());
}
void
Part_combine_iterator::derived_substitute (Context *f,
- Context *t)
+ Context *t)
{
if (first_iter_)
first_iter_->substitute_outlet (f, t);
}
void
-Part_combine_iterator::chords_together ()
+Part_combine_iterator::substitute_both (Outlet_type to1,
+ Outlet_type to2)
{
- if (state_ == TOGETHER)
- return;
- else
- {
- playing_state_ = TOGETHER;
- state_ = TOGETHER;
-
- substitute_both (CONTEXT_SHARED, CONTEXT_SHARED);
- }
-}
+ Outlet_type tos[] = {to1, to2};
-void
-Part_combine_iterator::kill_mmrest (int in)
-{
+ Music_iterator *mis[] = {first_iter_, second_iter_};
- if (!mmrest_event_)
+ for (int i = 0; i < 2; i++)
{
- mmrest_event_ = new Stream_event (ly_symbol2scm ("multi-measure-rest-event"));
- mmrest_event_->set_property ("duration", SCM_EOL);
- mmrest_event_->unprotect ();
+ for (int j = 0; j < NUM_OUTLETS; j++)
+ if (j != tos[i])
+ mis[i]->substitute_outlet (handles_[j].get_context (), handles_[tos[i]].get_context ());
}
- handles_[in].get_outlet ()->event_source ()->broadcast (mmrest_event_);
-}
-
-void
-Part_combine_iterator::solo1 ()
-{
- if (state_ == SOLO1)
- return;
- else
+ for (int j = 0; j < NUM_OUTLETS; j++)
{
- state_ = SOLO1;
- substitute_both (CONTEXT_SOLO, CONTEXT_NULL);
-
- kill_mmrest (CONTEXT_TWO);
- kill_mmrest (CONTEXT_SHARED);
-
- if (playing_state_ != SOLO1)
- {
- if (!solo_one_event_)
- {
- solo_one_event_ = new Stream_event (ly_symbol2scm ("solo-one-event"));
- solo_one_event_->unprotect ();
- }
-
- first_iter_->get_outlet ()->event_source ()->broadcast (solo_one_event_);
- }
- playing_state_ = SOLO1;
+ if (j != to1 && j != to2)
+ kill_mmrest (j);
}
}
void
-Part_combine_iterator::substitute_both (Outlet_type to1,
- Outlet_type to2)
+Part_combine_iterator::kill_mmrest (int in)
{
- Outlet_type tos[] = {to1, to2};
- Music_iterator *mis[] = {first_iter_, second_iter_};
-
- for (int i = 0; i < 2; i++)
+ if (!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 ());
+ mmrest_event_ = new Stream_event
+ (scm_call_1 (ly_lily_module_constant ("ly:make-event-class"),
+ ly_symbol2scm ("multi-measure-rest-event")));
+ mmrest_event_->set_property ("duration", SCM_EOL);
+ mmrest_event_->unprotect ();
}
- for (int j = 0; j < NUM_OUTLETS; j++)
- {
- if (j != to1 && j != to2)
- kill_mmrest (j);
- }
+ handles_[in].get_context ()->event_source ()->broadcast (mmrest_event_);
}
void
else
{
/*
- If we're coming from SOLO2 state, we might have kill mmrests
- in the 1st voice, so in that case, we use the second voice
- as a basis for events.
+ If we're coming from SOLO2 state, we might have kill mmrests
+ in the 1st voice, so in that case, we use the second voice
+ as a basis for events.
*/
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
- && newstate == UNISONO)
- {
- if (!unisono_event_)
- {
- unisono_event_ = new Stream_event (ly_symbol2scm ("unisono-event"));
- unisono_event_->unprotect ();
- }
-
-
- Context *out = (last_playing_ == SOLO2 ? second_iter_ : first_iter_)
- ->get_outlet ();
- out->event_source ()->broadcast (unisono_event_);
- playing_state_ = UNISONO;
- }
+ && newstate == UNISONO)
+ {
+ if (!unisono_event_)
+ {
+ unisono_event_ = new Stream_event
+ (scm_call_1 (ly_lily_module_constant ("ly:make-event-class"),
+ ly_symbol2scm ("unisono-event")));
+ unisono_event_->unprotect ();
+ }
+
+ Context *out = (last_playing_ == SOLO2 ? second_iter_ : first_iter_)
+ ->get_outlet ();
+ out->event_source ()->broadcast (unisono_event_);
+ playing_state_ = UNISONO;
+ }
state_ = newstate;
}
}
+void
+Part_combine_iterator::solo1 ()
+{
+ if (state_ == SOLO1)
+ return;
+ else
+ {
+ state_ = SOLO1;
+ substitute_both (CONTEXT_SOLO, CONTEXT_NULL);
+
+ kill_mmrest (CONTEXT_TWO);
+ kill_mmrest (CONTEXT_SHARED);
+
+ if (playing_state_ != SOLO1)
+ {
+ if (!solo_one_event_)
+ {
+ solo_one_event_ = new Stream_event
+ (scm_call_1 (ly_lily_module_constant ("ly:make-event-class"),
+ ly_symbol2scm ("solo-one-event")));
+ solo_one_event_->unprotect ();
+ }
+
+ first_iter_->get_outlet ()->event_source ()->broadcast (solo_one_event_);
+ }
+ playing_state_ = SOLO1;
+ }
+}
+
void
Part_combine_iterator::solo2 ()
{
substitute_both (CONTEXT_NULL, CONTEXT_SOLO);
if (playing_state_ != SOLO2)
- {
- if (!solo_two_event_)
- {
- solo_two_event_ = new Stream_event (ly_symbol2scm ("solo-two-event"));
- solo_two_event_->unprotect ();
- }
-
- second_iter_->get_outlet ()->event_source ()->broadcast (solo_two_event_);
- playing_state_ = SOLO2;
- }
+ {
+ if (!solo_two_event_)
+ {
+ solo_two_event_ = new Stream_event
+ (scm_call_1 (ly_lily_module_constant ("ly:make-event-class"),
+ ly_symbol2scm ("solo-two-event")));
+ solo_two_event_->unprotect ();
+ }
+
+ second_iter_->get_outlet ()->event_source ()->broadcast (solo_two_event_);
+ playing_state_ = SOLO2;
+ }
+ }
+}
+
+void
+Part_combine_iterator::chords_together ()
+{
+ if (state_ == TOGETHER)
+ return;
+ else
+ {
+ playing_state_ = TOGETHER;
+ state_ = TOGETHER;
+
+ substitute_both (CONTEXT_SHARED, CONTEXT_SHARED);
}
}
{
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 ();
c = c->find_create_context (type, outlet_names_[i], SCM_EOL);
handles_[i].set_context (c);
if (c->is_alias (ly_symbol2scm ("Voice")))
- c->event_source ()->add_listener (GET_LISTENER (set_busy), ly_symbol2scm ("music-event"));
+ c->event_source ()->add_listener (GET_LISTENER (set_busy), ly_symbol2scm ("music-event"));
}
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 ();
+ first_iter_ = Music_iterator::unsmob (get_iterator (Music::unsmob (scm_car (lst))));
+ Context *two = handles_[CONTEXT_TWO].get_context ();
set_context (two);
- second_iter_ = unsmob_iterator (get_iterator (unsmob_music (scm_cadr (lst))));
-
+ second_iter_ = Music_iterator::unsmob (get_iterator (Music::unsmob (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
directly??? */
char const *syms[]
- = {
+ =
+ {
"Stem",
"DynamicLineSpanner",
"Tie",
"Dots",
+ "MultiMeasureRest",
"Rest",
"Slur",
"TextScript",
{
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 */
+ /* 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));
- /* Also handle MultiMeasureRest positions for voice 1/2 */
- execute_pushpop_property (one, ly_symbol2scm ("MultiMeasureRest"),
- ly_symbol2scm ("staff-position"), scm_from_int (4));
- execute_pushpop_property (two, ly_symbol2scm ("MultiMeasureRest"),
- ly_symbol2scm ("staff-position"), scm_from_int (-4));
+ ly_symbol2scm ("horizontal-shift"), horizontalShiftTwo_);
}
if (!notice_busy_)
return;
- Stream_event *e = unsmob_stream_event (se);
+ Stream_event *e = Stream_event::unsmob (se);
if (e->in_event_class ("note-event") || e->in_event_class ("cluster-note-event"))
busy_ = true;
for (; scm_is_pair (split_list_); split_list_ = scm_cdr (split_list_))
{
- splitm = unsmob_moment (scm_caar (split_list_));
+ splitm = Moment::unsmob (scm_caar (split_list_));
if (splitm && *splitm + start_moment_ > now)
- break;
+ break;
SCM tag = scm_cdar (split_list_);
if (tag == ly_symbol2scm ("chords"))
- chords_together ();
+ chords_together ();
else if (tag == ly_symbol2scm ("apart")
- || tag == ly_symbol2scm ("apart-silence")
- || tag == ly_symbol2scm ("apart-spanner"))
- apart (tag == ly_symbol2scm ("apart-silence"));
+ || tag == ly_symbol2scm ("apart-silence")
+ || tag == ly_symbol2scm ("apart-spanner"))
+ apart (tag == ly_symbol2scm ("apart-silence"));
else if (tag == ly_symbol2scm ("unisono"))
- unisono (false);
+ unisono (false);
else if (tag == ly_symbol2scm ("unisilence"))
- unisono (true);
+ unisono (true);
else if (tag == ly_symbol2scm ("solo1"))
- solo1 ();
+ solo1 ();
else if (tag == ly_symbol2scm ("solo2"))
- 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);
- }
+ {
+ string s = "Unknown split directive: "
+ + (scm_is_symbol (tag) ? ly_symbol2string (tag) : string ("not a symbol"));
+ programming_error (s);
+ }
}
if (first_iter_->ok ())
if (second_iter_->ok ())
{
if (try_process (second_iter_, m))
- last_playing_ = SOLO2;
+ last_playing_ = SOLO2;
}
}
projects / lilypond.git / blobdiff