commit 2020.06.05.02

main
Michael Winter 5 years ago
parent e0fcffe391
commit 5a2ec442c7

File diff suppressed because one or more lines are too long

@ -17,7 +17,7 @@ r2. r8 [ f''''8 ] ~ | f''''1 ~ | f''''4 r2. | R1 | r2 f''''2 ~ | f''''1 ~ | f'
\time 3/2 \time 3/2
R1*3/2 | \bar ".|" \mark \markup { \bold \box 1.4 } R1*3/2 | \bar ".|" \mark \markup { \bold \box 1.4 }
\time 2/2 \time 2/2
r2. r8 [ f''''8 ] ~ | f''''1 ~ | f''''2. r4 | R1 | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''2. r4 | R1 | R1 | r8 [ f''''8 ] ~ f''''2. ~ | f''''1 | r8 [ f''''8 ] ~ f''''2. ~ | f''''2 r2 | R1 | R1 | \bar "|.|" \mark \markup { \bold \box 2.1 } r2. r8 [ f''''8 ] ~ | f''''1 ~ | f''''2. r4 | R1 | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''2. r4 | R1 | R1 | r8 [ f''''8 ] ~ f''''2. ~ | f''''1 | r8 [ f''''8 ] ~ f''''2. ~ | f''''2 r2 | R1 | R1 | \bar "||" \set Score.currentBarNumber = #1 \mark \markup { \bold \box 2.1 }
\pageBreak \pageBreak
r1 | R1 | r8 [ f''''8 ] ~ f''''2. ~ | f''''4 ~ f''''8 [ r8 ] r2 | r2. f''''4 ~ | f''''1 ~ | f''''8 [ r8 ] f''''2. ~ | f''''1 ~ | f''''8 [ r8 ] r2. | R1 | R1 | R1 | R1 | R1 | R1 | r1 | R1 | r8 [ f''''8 ] ~ f''''2. ~ | f''''4 ~ f''''8 [ r8 ] r2 | r2. f''''4 ~ | f''''1 ~ | f''''8 [ r8 ] f''''2. ~ | f''''1 ~ | f''''8 [ r8 ] r2. | R1 | R1 | R1 | R1 | R1 | R1 |
\time 3/2 \time 3/2
@ -25,7 +25,7 @@ R1*3/2 | \bar "||" \mark \markup { \bold \box 2.2 }
\time 2/2 \time 2/2
r1 | R1 | r4 r8 [ d''''8 ] ~ d''''2 ~ | d''''1 ~ | d''''4 ~ d''''8 [ r8 ] d''''2 ~ | d''''1 ~ | d''''4 r2. | R1 | R1 | R1 | R1 | \bar "||" \mark \markup { \bold \box 2.3 }r1 | r2. r8 [ f''''8 ] ~ | f''''1 ~ | f''''1 | r8 [ f''''8 ] ~ f''''2. ~ | f''''2. r8 [ f''''8 ] ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''2 r8 [ f''''8 ] ~ f''''4 ~ | f''''1 ~ | f''''1 | r8 [ f''''8 ] ~ f''''2. ~ | f''''2 ~ f''''8 [ r8 ] r4 | R1 | R1 | f''''1 ~ | f''''2 r8 [ f''''8 ] ~ f''''4 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''2. r8 [ f''''8 ] ~ | f''''1 ~ | f''''1 ~ | f''''4 ~ f''''8 [ r8 ] r2 | R1 | r2 r8 [ f''''8 ] ~ f''''4 ~ | f''''1 ~ | f''''8 [ r8 ] r2. | r4 r8 [ f''''8 ] ~ f''''2 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''1 | R1 | R1 | r8 [ f''''8 ] ~ f''''2. ~ | f''''2 r8 [ f''''8 ] ~ f''''4 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''8 [ r8 ] r2. | R1 | r4 r8 [ f''''8 ] ~ f''''2 ~ | f''''1 ~ | f''''4 r2. | R1 | R1 | \bar ".|" \mark \markup { \bold \box 2.4 }r1 | r2 r8 [ f''''8 ] ~ f''''4 ~ | f''''1 ~ | f''''1 | R1 | r2 r8 [ f''''8 ] ~ f''''4 ~ | f''''1 ~ | f''''1 ~ | f''''8 [ r8 ] f''''2. ~ | f''''1 ~ | f''''2 ~ f''''8 [ r8 ] r4 | r1 | R1 | r4 r8 [ d''''8 ] ~ d''''2 ~ | d''''1 ~ | d''''4 ~ d''''8 [ r8 ] d''''2 ~ | d''''1 ~ | d''''4 r2. | R1 | R1 | R1 | R1 | \bar "||" \mark \markup { \bold \box 2.3 }r1 | r2. r8 [ f''''8 ] ~ | f''''1 ~ | f''''1 | r8 [ f''''8 ] ~ f''''2. ~ | f''''2. r8 [ f''''8 ] ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''2 r8 [ f''''8 ] ~ f''''4 ~ | f''''1 ~ | f''''1 | r8 [ f''''8 ] ~ f''''2. ~ | f''''2 ~ f''''8 [ r8 ] r4 | R1 | R1 | f''''1 ~ | f''''2 r8 [ f''''8 ] ~ f''''4 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''2. r8 [ f''''8 ] ~ | f''''1 ~ | f''''1 ~ | f''''4 ~ f''''8 [ r8 ] r2 | R1 | r2 r8 [ f''''8 ] ~ f''''4 ~ | f''''1 ~ | f''''8 [ r8 ] r2. | r4 r8 [ f''''8 ] ~ f''''2 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''1 | R1 | R1 | r8 [ f''''8 ] ~ f''''2. ~ | f''''2 r8 [ f''''8 ] ~ f''''4 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''8 [ r8 ] r2. | R1 | r4 r8 [ f''''8 ] ~ f''''2 ~ | f''''1 ~ | f''''4 r2. | R1 | R1 | \bar ".|" \mark \markup { \bold \box 2.4 }r1 | r2 r8 [ f''''8 ] ~ f''''4 ~ | f''''1 ~ | f''''1 | R1 | r2 r8 [ f''''8 ] ~ f''''4 ~ | f''''1 ~ | f''''1 ~ | f''''8 [ r8 ] f''''2. ~ | f''''1 ~ | f''''2 ~ f''''8 [ r8 ] r4 |
\time 3/2 \time 3/2
R1*3/2 | \bar "|.|" \mark \markup { \bold \box 3.1 } R1*3/2 | \bar "||" \set Score.currentBarNumber = #1 \mark \markup { \bold \box 3.1 }
\pageBreak \pageBreak
\time 2/2 \time 2/2
@ -35,7 +35,7 @@ R1*3/2 | \bar "||" \mark \markup { \bold \box 3.3 }
\time 2/2 \time 2/2
r1 | r2 f''''2 ~ | f''''1 ~ | f''''4 r8 [ f''''8 ] ~ f''''2 ~ | f''''1 ~ | f''''2. ~ f''''8 [ r8 ] | R1 | r8 [ f''''8 ] ~ f''''2. ~ | f''''1 ~ | f''''4 ~ f''''8 [ r8 ] r2 | r2. f''''4 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''8 [ r8 ] f''''2. ~ | f''''2. ~ f''''8 [ r8 ] | f''''1 ~ | f''''1 ~ | f''''8 [ r8 ] r2. | R1 | r4 r8 [ f''''8 ] ~ f''''2 ~ | f''''1 ~ | f''''4 ~ f''''8 [ r8 ] r2 | R1 | r2. f''''4 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''2 ~ f''''8 [ r8 ] f''''4 ~ | f''''1 ~ | f''''2. ~ f''''8 [ r8 ] | R1 | r2 r8 [ f''''8 ] ~ f''''4 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''2 ~ f''''8 [ r8 ] r4 | R1 | r8 [ f''''8 ] ~ f''''2. ~ | f''''1 ~ | f''''4 r2. | R1 | f''''1 ~ | f''''1 ~ | f''''2 r8 [ f''''8 ] ~ f''''4 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''2 ~ f''''8 [ r8 ] r4 | R1 | r4 r8 [ f''''8 ] ~ f''''2 ~ | f''''2. ~ f''''8 [ r8 ] | R1 | R1 | \bar ".|" \mark \markup { \bold \box 3.4 }r2. r8 [ f''''8 ] ~ | f''''1 ~ | f''''1 ~ | f''''4 r8 [ f''''8 ] ~ f''''2 ~ | f''''1 ~ | f''''2 r8 [ f''''8 ] ~ f''''4 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''4 ~ f''''8 [ r8 ] f''''2 ~ | f''''1 ~ | f''''2 r2 | r1 | r2 f''''2 ~ | f''''1 ~ | f''''4 r8 [ f''''8 ] ~ f''''2 ~ | f''''1 ~ | f''''2. ~ f''''8 [ r8 ] | R1 | r8 [ f''''8 ] ~ f''''2. ~ | f''''1 ~ | f''''4 ~ f''''8 [ r8 ] r2 | r2. f''''4 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''8 [ r8 ] f''''2. ~ | f''''2. ~ f''''8 [ r8 ] | f''''1 ~ | f''''1 ~ | f''''8 [ r8 ] r2. | R1 | r4 r8 [ f''''8 ] ~ f''''2 ~ | f''''1 ~ | f''''4 ~ f''''8 [ r8 ] r2 | R1 | r2. f''''4 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''2 ~ f''''8 [ r8 ] f''''4 ~ | f''''1 ~ | f''''2. ~ f''''8 [ r8 ] | R1 | r2 r8 [ f''''8 ] ~ f''''4 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''2 ~ f''''8 [ r8 ] r4 | R1 | r8 [ f''''8 ] ~ f''''2. ~ | f''''1 ~ | f''''4 r2. | R1 | f''''1 ~ | f''''1 ~ | f''''2 r8 [ f''''8 ] ~ f''''4 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''2 ~ f''''8 [ r8 ] r4 | R1 | r4 r8 [ f''''8 ] ~ f''''2 ~ | f''''2. ~ f''''8 [ r8 ] | R1 | R1 | \bar ".|" \mark \markup { \bold \box 3.4 }r2. r8 [ f''''8 ] ~ | f''''1 ~ | f''''1 ~ | f''''4 r8 [ f''''8 ] ~ f''''2 ~ | f''''1 ~ | f''''2 r8 [ f''''8 ] ~ f''''4 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''4 ~ f''''8 [ r8 ] f''''2 ~ | f''''1 ~ | f''''2 r2 |
\time 3/2 \time 3/2
R1*3/2 | \bar "|.|" \mark \markup { \bold \box 4.1 } R1*3/2 | \bar "||" \set Score.currentBarNumber = #1 \mark \markup { \bold \box 4.1 }
\pageBreak \pageBreak
\time 2/2 \time 2/2

@ -17,7 +17,7 @@ R1*3/2 | \bar "||" \mark \markup { \bold \box 1.3 }
\time 3/2 \time 3/2
R1*3/2 | \bar ".|" \mark \markup { \bold \box 1.4 } R1*3/2 | \bar ".|" \mark \markup { \bold \box 1.4 }
\time 2/2 \time 2/2
<<{ d,,4 \laissezVibrer ^ \markup{ 0.0 } }\\ {\new Voice { \voiceTwo d,,4 \laissezVibrer }}>> \oneVoice r2. | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | \bar "|.|" \mark \markup { \bold \box 2.1 } <<{ d,,4 \laissezVibrer ^ \markup{ 0.0 } }\\ {\new Voice { \voiceTwo d,,4 \laissezVibrer }}>> \oneVoice r2. | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | \bar "||" \set Score.currentBarNumber = #1 \mark \markup { \bold \box 2.1 }
\pageBreak \pageBreak
<<{ d,4 \laissezVibrer ^ \markup{ 0.0 } }\\ {\new Voice { \voiceTwo d,4 \laissezVibrer }}>> \oneVoice r2. | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | <<{ d,4 \laissezVibrer ^ \markup{ 0.0 } }\\ {\new Voice { \voiceTwo d,4 \laissezVibrer }}>> \oneVoice r2. | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 |
\time 3/2 \time 3/2
@ -25,7 +25,7 @@ R1*3/2 | \bar "||" \mark \markup { \bold \box 2.2 }
\time 2/2 \time 2/2
<<{ a,,4 \laissezVibrer ^ \markup{ 5.0 } }\\ {\new Voice { \voiceTwo a,,4 \laissezVibrer }}>> \oneVoice r2. | r4 <<{ a,,4 \laissezVibrer ^ \markup{ 4.2 } }\\ {\new Voice { \voiceTwo a,,4 \laissezVibrer }}>> \oneVoice r2 | R1 | <<{ a,,4 \laissezVibrer ^ \markup{ 3.3 } }\\ {\new Voice { \voiceTwo a,,4 \laissezVibrer }}>> \oneVoice r2. | R1 | r4 <<{ a,,4 \laissezVibrer ^ \markup{ 2.5 } }\\ {\new Voice { \voiceTwo a,,4 \laissezVibrer }}>> \oneVoice r2 | R1 | r4 <<{ a,,4 \laissezVibrer ^ \markup{ 1.7 } }\\ {\new Voice { \voiceTwo a,,4 \laissezVibrer }}>> \oneVoice r2 | R1 | r2 <<{ a,,4 \laissezVibrer ^ \markup{ 0.8 } }\\ {\new Voice { \voiceTwo a,,4 \laissezVibrer }}>> \oneVoice r4 | R1 | \bar "||" \mark \markup { \bold \box 2.3 } <<{ d,4 \laissezVibrer ^ \markup{ 0.0 } }\\ {\new Voice { \voiceTwo d,4 \laissezVibrer }}>> \oneVoice r2. | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | <<{ f,,4 \laissezVibrer ^ \markup{ 4.0 } }\\ {\new Voice { \voiceTwo f,,4 \laissezVibrer }}>> \oneVoice r2. | R1 | R1 | R1 | R1 | <<{ e,,4 \laissezVibrer ^ \markup{ 2.0 } }\\ {\new Voice { \voiceTwo e,,4 \laissezVibrer }}>> \oneVoice r2. | R1 | R1 | R1 | R1 | \bar ".|" \mark \markup { \bold \box 2.4 } <<{ d,,4 \laissezVibrer ^ \markup{ 0.0 } }\\ {\new Voice { \voiceTwo d,,4 \laissezVibrer }}>> \oneVoice r2. | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | <<{ a,,4 \laissezVibrer ^ \markup{ 5.0 } }\\ {\new Voice { \voiceTwo a,,4 \laissezVibrer }}>> \oneVoice r2. | r4 <<{ a,,4 \laissezVibrer ^ \markup{ 4.2 } }\\ {\new Voice { \voiceTwo a,,4 \laissezVibrer }}>> \oneVoice r2 | R1 | <<{ a,,4 \laissezVibrer ^ \markup{ 3.3 } }\\ {\new Voice { \voiceTwo a,,4 \laissezVibrer }}>> \oneVoice r2. | R1 | r4 <<{ a,,4 \laissezVibrer ^ \markup{ 2.5 } }\\ {\new Voice { \voiceTwo a,,4 \laissezVibrer }}>> \oneVoice r2 | R1 | r4 <<{ a,,4 \laissezVibrer ^ \markup{ 1.7 } }\\ {\new Voice { \voiceTwo a,,4 \laissezVibrer }}>> \oneVoice r2 | R1 | r2 <<{ a,,4 \laissezVibrer ^ \markup{ 0.8 } }\\ {\new Voice { \voiceTwo a,,4 \laissezVibrer }}>> \oneVoice r4 | R1 | \bar "||" \mark \markup { \bold \box 2.3 } <<{ d,4 \laissezVibrer ^ \markup{ 0.0 } }\\ {\new Voice { \voiceTwo d,4 \laissezVibrer }}>> \oneVoice r2. | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | <<{ f,,4 \laissezVibrer ^ \markup{ 4.0 } }\\ {\new Voice { \voiceTwo f,,4 \laissezVibrer }}>> \oneVoice r2. | R1 | R1 | R1 | R1 | <<{ e,,4 \laissezVibrer ^ \markup{ 2.0 } }\\ {\new Voice { \voiceTwo e,,4 \laissezVibrer }}>> \oneVoice r2. | R1 | R1 | R1 | R1 | \bar ".|" \mark \markup { \bold \box 2.4 } <<{ d,,4 \laissezVibrer ^ \markup{ 0.0 } }\\ {\new Voice { \voiceTwo d,,4 \laissezVibrer }}>> \oneVoice r2. | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 |
\time 3/2 \time 3/2
R1*3/2 | \bar "|.|" \mark \markup { \bold \box 3.1 } R1*3/2 | \bar "||" \set Score.currentBarNumber = #1 \mark \markup { \bold \box 3.1 }
\pageBreak \pageBreak
\time 2/2 \time 2/2
@ -35,7 +35,7 @@ R1*3/2 | \bar "||" \mark \markup { \bold \box 3.3 }
\time 2/2 \time 2/2
<<{ d,4 \laissezVibrer ^ \markup{ 0.0 } }\\ {\new Voice { \voiceTwo d,4 \laissezVibrer }}>> \oneVoice r2. | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | r2. <<{ f,,4 \laissezVibrer ^ \markup{ 4.0 } }\\ {\new Voice { \voiceTwo f,,4 \laissezVibrer }}>> \oneVoice | R1 | R1 | R1 | R1 | r2 <<{ e,,4 \laissezVibrer ^ \markup{ 2.0 } }\\ {\new Voice { \voiceTwo e,,4 \laissezVibrer }}>> \oneVoice r4 | R1 | R1 | R1 | \bar ".|" \mark \markup { \bold \box 3.4 } <<{ d,,4 \laissezVibrer ^ \markup{ 0.0 } }\\ {\new Voice { \voiceTwo d,,4 \laissezVibrer }}>> \oneVoice r2. | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | <<{ d,4 \laissezVibrer ^ \markup{ 0.0 } }\\ {\new Voice { \voiceTwo d,4 \laissezVibrer }}>> \oneVoice r2. | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | r2. <<{ f,,4 \laissezVibrer ^ \markup{ 4.0 } }\\ {\new Voice { \voiceTwo f,,4 \laissezVibrer }}>> \oneVoice | R1 | R1 | R1 | R1 | r2 <<{ e,,4 \laissezVibrer ^ \markup{ 2.0 } }\\ {\new Voice { \voiceTwo e,,4 \laissezVibrer }}>> \oneVoice r4 | R1 | R1 | R1 | \bar ".|" \mark \markup { \bold \box 3.4 } <<{ d,,4 \laissezVibrer ^ \markup{ 0.0 } }\\ {\new Voice { \voiceTwo d,,4 \laissezVibrer }}>> \oneVoice r2. | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 |
\time 3/2 \time 3/2
R1*3/2 | \bar "|.|" \mark \markup { \bold \box 4.1 } R1*3/2 | \bar "||" \set Score.currentBarNumber = #1 \mark \markup { \bold \box 4.1 }
\pageBreak \pageBreak
\time 2/2 \time 2/2

@ -41,7 +41,7 @@
win = Window("Counterfeiting in Colonial Connecticut", Rect(500, 500, 1100, 500), false).front; win = Window("Counterfeiting in Colonial Connecticut", Rect(500, 500, 1100, 500), false).front;
masterView = { masterView = {
var view, masterIndicators, master, generator, transport, ranSeed, startPosText, var view, masterIndicators, master, generator, transport, ranSeed, order, startPosText,
prevSectionButton, prevSubsectionButton, playStopButton, nextSubsectionButton, nextSectionButton, prevSectionButton, prevSubsectionButton, playStopButton, nextSubsectionButton, nextSectionButton,
sectionDisplay, clock, metronome; sectionDisplay, clock, metronome;
@ -52,10 +52,14 @@
}; };
~updateSection = {arg shift, stop = true, manualCall = true; ~updateSection = {arg shift, stop = true, manualCall = true;
if((manualCall || (manualCall.not && ~autoAdvance.not)).postln && ((~currentSection + shift) < ~patterns.size), { var runThis;
runThis = (manualCall || (manualCall.not && ~autoAdvance.postln));
runThis = runThis && ((~currentSection + shift) < ~sectionOrder.size);
runThis = runThis && (((~currentSection % 4) == 3) && ~interludes && manualCall.not).not;
if(runThis, {
var truncOnly, section, subSection; var truncOnly, section, subSection;
if(~isPlaying, { if(~isPlaying, {
if(stop, {~patterns[~currentSection].stop}); if(stop, {~patterns[~sectionOrder[~currentSection]].stop});
}); });
truncOnly = case truncOnly = case
@ -70,18 +74,26 @@
~currentSection = ~currentSection.trunc(shift.abs); ~currentSection = ~currentSection.trunc(shift.abs);
}); });
section = ((~currentSection / 4) + 1).asInteger; section = ((~sectionOrder[~currentSection] / 4) + 1).asInteger;
subSection = ((~currentSection % 4) + 1).asInteger; subSection = ((~sectionOrder[~currentSection] % 4) + 1).asInteger;
sectionDisplay.string = "section: " ++ section.asString ++ "." ++ subSection.asString; sectionDisplay.string = "section: " ++ section.asString ++ "." ++ subSection.asString;
if(~isPlaying, { if(~isPlaying, {
~play.set(\sel, ~currentSection % 2); ~play.set(\sel, ~currentSection % 2);
~patterns[~currentSection].play(quant: 0); ~patterns[~sectionOrder[~currentSection]].play(quant: 0);
if(~interludes && ((~currentSection % 4) == 3) && (~currentSection != (~sectionOrder.size - 1)), {
~droneFade.set(\gate, 1);
~dronePattern.play(quant: 0)
});
if((~currentSection % 4) == 0, { if((~currentSection % 4) == 0, {
~droneFade.set(\gate, 0); ~droneFade.set(\gate, 0);
}); });
if(((~currentSection % 4)) != 0 && ((~currentSection % 4) != 3), {
~droneFade.set(\gate, 0);
~dronePattern.stop
});
}, { }, {
var measure, beat; var measure, beat;
measure = ~sectionStartMeasure[~currentSection]; measure = ~sectionStartMeasure[~sectionOrder[~currentSection]];
beat = 1; beat = 1;
~updateTransport.value(measure, beat); ~updateTransport.value(measure, beat);
}); });
@ -126,18 +138,19 @@
if(pState.value == 0, { if(pState.value == 0, {
var measure, beat; var measure, beat;
~isPlaying = false; ~isPlaying = false;
~patterns[~currentSection].stop; ~patterns[~sectionOrder[~currentSection]].stop;
~droneFade.set(\gate, 0); ~droneFade.set(\gate, 0);
measure = ~sectionStartMeasure[~currentSection]; measure = ~sectionStartMeasure[~currentSection];
beat = 1; beat = 1;
~updateTransport.value(measure, beat) ~updateTransport.value(measure, beat);
~droneFade.set(\gate, 0);
~dronePattern.stop
},{ },{
~isPlaying = true; ~isPlaying = true;
~play.set(\sel, ~currentSection % 2); ~play.set(\sel, ~currentSection % 2);
~patterns[~currentSection].play(quant: 0); ~patterns[~sectionOrder[~currentSection]].play(quant: 0);
if(~interludes && ((~currentSection % 4) == 3), { if(~interludes && ((~currentSection % 4) == 3) && (~currentSection != (~sectionOrder.size - 1)), {
~droneFade.set(\gate, 1); ~droneFade.set(\gate, 1);
~play = Synth.new(\droneOut);
~dronePattern.play(quant: 0) ~dronePattern.play(quant: 0)
}); });
}) })
@ -159,12 +172,29 @@
metronome = StaticText(win).string_([-30, -105, -104].asAscii).font_(Font("Monaco", 300)).stringColor_(Color.red)), metronome = StaticText(win).string_([-30, -105, -104].asAscii).font_(Font("Monaco", 300)).stringColor_(Color.red)),
nil, transport, nil, nil, transport, nil,
HLayout(Button(view).states_([["auto advance", Color.black], ["auto advance", Color.black, Color.grey]]).action_({ HLayout(Button(view).states_([["auto advance", Color.black], ["auto advance", Color.black, Color.grey]]).action_({
|v| ~autoAdvance = if(v == 0, {false}, {true}) |v| ~autoAdvance = if(v.value == 0, {false}, {true});~autoAdvance.postln;
}).value_(1), }).value_(1),
Button(view).states_([["interludes", Color.black], ["interludes", Color.black, Color.grey]]).action_({ Button(view).states_([["interludes", Color.black], ["interludes", Color.black, Color.grey]]).action_({
|v| ~interludes = if(v == 0, {false}, {true}) |v| ~interludes = if(v.value == 0, {false}, {true})
}), }),
[StaticText(view).string_(" "), stretch: 1]), [StaticText(view).string_(" "), stretch: 1]),
[StaticText(view).string_(" "), stretch: 1],
HLayout(
order = TextField(view).string_("1-4"),
Button(view).states_([["set order"]]).action_({
~patterns[~sectionOrder[~currentSection]].stop;
~sectionOrder = order.string.postln.split($,).collect({arg secEntry;
var bounds;
bounds = secEntry.split($-).collect({arg item; item.asInteger - 1});
((bounds.minItem)..(bounds.maxItem)).collect({arg sec;
(sec.asInteger * 4) + [0, 1, 2, 3]
});
}).flat;
~sectionOrder.postln;
~currentSection = 0;
~updateSection.value(0);
}),
[StaticText(view).string_(" "), stretch: 1]),
[StaticText(view).string_(" "), stretch: 1], generator [StaticText(view).string_(" "), stretch: 1], generator
), alignment: \top])) }; ), alignment: \top])) };
faderView = { faderView = {

@ -1,7 +1,7 @@
( (
// MAIN LAUNCH (loads necessary files and definitions) // MAIN LAUNCH (loads necessary files and definitions)
var appEnvironment, cond; var appEnvironment;
appEnvironment = Environment.make; appEnvironment = Environment.make;
appEnvironment.push; appEnvironment.push;
@ -30,6 +30,7 @@ s.waitForBoot({
~droneFade = Synth.new(\droneFade); ~droneFade = Synth.new(\droneFade);
~autoAdvance = true; ~autoAdvance = true;
~interludes = false; ~interludes = false;
~sectionOrder = ~patterns.size.collect({arg sec; sec});
~generateGUI.value; ~generateGUI.value;
appEnvironment.pop; appEnvironment.pop;
@ -54,6 +55,8 @@ s.waitForBoot({
~launchGui.value; ~launchGui.value;
*/ */
) )
~dir
~fader = Synth(\crossFade, [\sel, 0, \busA, ~busA.index, \busB, ~busB.index]); ~fader = Synth(\crossFade, [\sel, 0, \busA, ~busA.index, \busB, ~busB.index]);
~currentSection = 0 ~currentSection = 0
~play.set(\sel, ~currentSection % 2); ~play.set(\sel, ~currentSection % 2);
@ -75,7 +78,8 @@ s.waitForBoot({
~dronePattern.play ~dronePattern.play
) )
~droneFade.set(\gate, 0) ~droneFade.set(\gate, 1)
~dronePattern.stop
t = Synth.new(\droneOut); t = Synth.new(\droneOut);
t.free t.free

@ -65,8 +65,6 @@ SynthDef(\masterPlayerControl, {
SynthDef(\transport, {arg measure = 0, beat = 0, gate = 1, dur = 1; SynthDef(\transport, {arg measure = 0, beat = 0, gate = 1, dur = 1;
measure.poll;
beat.poll;
SendReply.kr(Impulse.kr(0) * (measure > 0) * (beat > 0),'/measureClock', values: [measure, beat]); SendReply.kr(Impulse.kr(0) * (measure > 0) * (beat > 0),'/measureClock', values: [measure, beat]);
SendReply.kr(TDelay.kr(Impulse.kr(0) * (measure > 0) * (beat > 0), 0.25),'/measureClockReset'); SendReply.kr(TDelay.kr(Impulse.kr(0) * (measure > 0) * (beat > 0), 0.25),'/measureClockReset');
SendReply.kr(Impulse.kr(0) * (measure < 1) * (beat < 1),'/playNextSubsection'); SendReply.kr(Impulse.kr(0) * (measure < 1) * (beat < 1),'/playNextSubsection');
@ -117,12 +115,13 @@ SynthDef(\drone, { arg out=0, freq=440, amp=0.1, pan=0, gate=1, bus;
SynthDef(\droneFade, {arg gate = 0; SynthDef(\droneFade, {arg gate = 0;
Out.ar([0, 1], Clip.ar(In.ar(~droneBus, 1), -1, 1) * 0.1 * EnvGen.ar(Env.asr(20, 1, 20), gate.poll)) Out.ar([0, 1], Clip.ar(In.ar(~droneBus, 1), -1, 1) * 0.1 * EnvGen.ar(Env.asr(20, 1, 20), gate))
} }
).add; ).add;
~dronePattern = Pbind( ~dronePattern = EventPatternProxy.new;
~dronePattern.source = Pbind(
\instrument, \drone, \instrument, \drone,
\amp, 0.5, \amp, 0.5,
\dur, 0.02, \dur, 0.02,

@ -122,7 +122,10 @@
if((i == (sectionData[sectionCount][0] / 4)) && (g == 0),{ if((i == (sectionData[sectionCount][0] / 4)) && (g == 0),{
var barType, pageBreak; var barType, pageBreak;
barType = switch(sectionData[sectionCount][1], 0, {"\"||\""}, 1, {"\".|\""}, -1, {"\"|.|\""}); barType = switch(sectionData[sectionCount][1],
0, {"\"||\""},
1, {"\".|\""},
-1, {"\"||\" \\set Score.currentBarNumber = #1 "});
pageBreak = switch(sectionData[sectionCount][1], 0, {""}, 1, {""}, -1, {measureCount = 0; "\n\\pageBreak \n"}); pageBreak = switch(sectionData[sectionCount][1], 0, {""}, 1, {""}, -1, {measureCount = 0; "\n\\pageBreak \n"});
isHarmonic = switch(sectionData[sectionCount][1], 0, {false}, 1, {true}, -1, {false}); isHarmonic = switch(sectionData[sectionCount][1], 0, {false}, 1, {true}, -1, {false});
lilyString = lilyString + " \\bar " ++ barType ++ " \\mark \\markup { \\bold \\box " ++ sectionIndex ++ "." ++ subSectionIndex ++ " }" ++ pageBreak; lilyString = lilyString + " \\bar " ++ barType ++ " \\mark \\markup { \\bold \\box " ++ sectionIndex ++ "." ++ subSectionIndex ++ " }" ++ pageBreak;

Loading…
Cancel
Save