[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Issue 4385: Part_combine_iterator: remove residue related to marks (issu
From: |
nine . fierce . ballads |
Subject: |
Issue 4385: Part_combine_iterator: remove residue related to marks (issue 231560043 by address@hidden) |
Date: |
Mon, 11 May 2015 02:11:41 +0000 |
Reviewers: ,
Description:
This could have been removed when the generation of mark events was
moved from C++ to Scheme in aae8f9ee8f62e8a57f4f60a60e639a040571f37b,
but it went unnoticed at that time.
Please review this at https://codereview.appspot.com/231560043/
Affected files (+0, -23 lines):
M lily/part-combine-iterator.cc
Index: lily/part-combine-iterator.cc
diff --git a/lily/part-combine-iterator.cc b/lily/part-combine-iterator.cc
index
f84e70cc9ac00bcf903ccf42cb9797fb64e6d8ac..7bfc2861c02bc1adbbc553e454e68422e02b7250
100644
--- a/lily/part-combine-iterator.cc
+++ b/lily/part-combine-iterator.cc
@@ -82,15 +82,6 @@ private:
// e.g. 1 for Solo I, 2 for Solo II.
int chosen_part_;
- // States for generating partcombine text.
- enum PlayingState
- {
- PLAYING_OTHER,
- PLAYING_UNISONO,
- PLAYING_SOLO1,
- PLAYING_SOLO2,
- } playing_state_;
-
int last_playing_;
/*
@@ -137,7 +128,6 @@ Part_combine_iterator::Part_combine_iterator ()
split_list_ = SCM_EOL;
state_ = APART;
chosen_part_ = 1;
- playing_state_ = PLAYING_OTHER;
last_playing_ = 0;
busy_ = false;
@@ -235,11 +225,6 @@ Part_combine_iterator::unisono (bool silent, int
newpart)
kill_mmrest ((newpart == 2) ? CONTEXT_ONE : CONTEXT_TWO);
kill_mmrest (CONTEXT_SHARED);
- if (playing_state_ != PLAYING_UNISONO
- && newstate == UNISONO)
- {
- playing_state_ = PLAYING_UNISONO;
- }
state_ = newstate;
chosen_part_ = newpart;
}
@@ -258,8 +243,6 @@ Part_combine_iterator::solo1 ()
kill_mmrest (CONTEXT_TWO);
kill_mmrest (CONTEXT_SHARED);
-
- playing_state_ = PLAYING_SOLO1;
}
}
@@ -273,8 +256,6 @@ Part_combine_iterator::solo2 ()
state_ = SOLO;
chosen_part_ = 2;
substitute_both (CONTEXT_NULL, CONTEXT_SOLO);
-
- playing_state_ = PLAYING_SOLO2;
}
}
@@ -285,7 +266,6 @@ Part_combine_iterator::chords_together ()
return;
else
{
- playing_state_ = PLAYING_OTHER;
state_ = TOGETHER;
substitute_both (CONTEXT_SHARED, CONTEXT_SHARED);
@@ -295,9 +275,6 @@ Part_combine_iterator::chords_together ()
void
Part_combine_iterator::apart (bool silent)
{
- if (!silent)
- playing_state_ = PLAYING_OTHER;
-
if (state_ == APART)
return;
else
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- Issue 4385: Part_combine_iterator: remove residue related to marks (issue 231560043 by address@hidden),
nine . fierce . ballads <=