Some adjustments

oeholmen · Mar 5, 2023 · c976574 · c976574
1 parent 8b51eae
commit c976574
Show file tree

Hide file tree

Showing 8 changed files with 53 additions and 53 deletions.
diff --git a/compiled/modular/multiSequenceTriggerCompiled.lua b/compiled/modular/multiSequenceTriggerCompiled.lua
@@ -446,16 +446,9 @@ function startPlaying()
   if isPlaying == true then
     return
   end
-  seqIndex = gem.inc(seqIndex)
-  spawn(pageRunner, seqIndex)
-  playingIndex = {}
-  for i=1,numParts do
-    --print("Start playing", i)
-    playIndex = gem.inc(playIndex)
-    table.insert(playingIndex, playIndex)
-    spawn(arpeg, i, playIndex)
-  end
   isPlaying = true
+  seqIndex = gem.inc(seqIndex)
+  run(pageRunner, seqIndex)
 end
 
 function stopPlaying()
@@ -1075,6 +1068,13 @@ footerPanel.y = paramsPerPage[1].sequencerPanel.y + paramsPerPage[1].sequencerPa
 --------------------------------------------------------------------------------
 
 function pageRunner(uniqueId)
+  playingIndex = {}
+  for i=1,numParts do
+    --print("Start playing", i)
+    playIndex = gem.inc(playIndex)
+    table.insert(playingIndex, playIndex)
+    spawn(arpeg, playIndex, i)
+  end
   local rounds = 0
   while isPlaying and seqIndex == uniqueId do
     rounds = rounds + 1
@@ -1096,7 +1096,7 @@ function pageRunner(uniqueId)
   end
 end
 
-function arpeg(part, uniqueId)
+function arpeg(uniqueId, part)
   local index = 0
   local partDirectionBackward = false
   while isPlaying and playingIndex[part] == uniqueId do

diff --git a/compiled/modular/rythmicFragmentsTriggerCompiled.lua b/compiled/modular/rythmicFragmentsTriggerCompiled.lua
@@ -1495,7 +1495,6 @@ local function sequenceRunner(uniqueId)
   local partInfo = nil
   local startEvolve = false -- Can be set by part order
   local beatCounter = 1 -- Holds the beat count
-  isPlaying = true
   initVoices()
   while isPlaying and seqIndex == uniqueId do
     print("Playing beat", beatCounter)
@@ -1561,6 +1560,7 @@ local function startPlaying()
   if isPlaying then
     return
   end
+  isPlaying = true
   seqIndex = gem.inc(seqIndex)
   run(sequenceRunner, seqIndex)
 end

diff --git a/compiled/modular/rythmicFragmentsTriggerEightPartCompiled.lua b/compiled/modular/rythmicFragmentsTriggerEightPartCompiled.lua
@@ -1495,7 +1495,6 @@ local function sequenceRunner(uniqueId)
   local partInfo = nil
   local startEvolve = false -- Can be set by part order
   local beatCounter = 1 -- Holds the beat count
-  isPlaying = true
   initVoices()
   while isPlaying and seqIndex == uniqueId do
     print("Playing beat", beatCounter)
@@ -1561,6 +1560,7 @@ local function startPlaying()
   if isPlaying then
     return
   end
+  isPlaying = true
   seqIndex = gem.inc(seqIndex)
   run(sequenceRunner, seqIndex)
 end

diff --git a/compiled/modular/sequenceTriggerCompiled.lua b/compiled/modular/sequenceTriggerCompiled.lua
@@ -446,16 +446,9 @@ function startPlaying()
   if isPlaying == true then
     return
   end
-  seqIndex = gem.inc(seqIndex)
-  spawn(pageRunner, seqIndex)
-  playingIndex = {}
-  for i=1,numParts do
-    --print("Start playing", i)
-    playIndex = gem.inc(playIndex)
-    table.insert(playingIndex, playIndex)
-    spawn(arpeg, i, playIndex)
-  end
   isPlaying = true
+  seqIndex = gem.inc(seqIndex)
+  run(pageRunner, seqIndex)
 end
 
 function stopPlaying()
@@ -1075,6 +1068,13 @@ footerPanel.y = paramsPerPage[1].sequencerPanel.y + paramsPerPage[1].sequencerPa
 --------------------------------------------------------------------------------
 
 function pageRunner(uniqueId)
+  playingIndex = {}
+  for i=1,numParts do
+    --print("Start playing", i)
+    playIndex = gem.inc(playIndex)
+    table.insert(playingIndex, playIndex)
+    spawn(arpeg, playIndex, i)
+  end
   local rounds = 0
   while isPlaying and seqIndex == uniqueId do
     rounds = rounds + 1
@@ -1096,7 +1096,7 @@ function pageRunner(uniqueId)
   end
 end
 
-function arpeg(part, uniqueId)
+function arpeg(uniqueId, part)
   local index = 0
   local partDirectionBackward = false
   while isPlaying and playingIndex[part] == uniqueId do

diff --git a/compiled/sequencers/stochasticDrumSequencerCompiled.lua b/compiled/sequencers/stochasticDrumSequencerCompiled.lua
@@ -446,16 +446,9 @@ function startPlaying()
   if isPlaying == true then
     return
   end
-  seqIndex = gem.inc(seqIndex)
-  spawn(pageRunner, seqIndex)
-  playingIndex = {}
-  for i=1,numParts do
-    --print("Start playing", i)
-    playIndex = gem.inc(playIndex)
-    table.insert(playingIndex, playIndex)
-    spawn(arpeg, i, playIndex)
-  end
   isPlaying = true
+  seqIndex = gem.inc(seqIndex)
+  run(pageRunner, seqIndex)
 end
 
 function stopPlaying()
@@ -1075,6 +1068,13 @@ footerPanel.y = paramsPerPage[1].sequencerPanel.y + paramsPerPage[1].sequencerPa
 --------------------------------------------------------------------------------
 
 function pageRunner(uniqueId)
+  playingIndex = {}
+  for i=1,numParts do
+    --print("Start playing", i)
+    playIndex = gem.inc(playIndex)
+    table.insert(playingIndex, playIndex)
+    spawn(arpeg, playIndex, i)
+  end
   local rounds = 0
   while isPlaying and seqIndex == uniqueId do
     rounds = rounds + 1
@@ -1096,7 +1096,7 @@ function pageRunner(uniqueId)
   end
 end
 
-function arpeg(part, uniqueId)
+function arpeg(uniqueId, part)
   local index = 0
   local partDirectionBackward = false
   while isPlaying and playingIndex[part] == uniqueId do

diff --git a/compiled/util/noteTriggerCompiled.lua b/compiled/util/noteTriggerCompiled.lua
@@ -446,16 +446,9 @@ function startPlaying()
   if isPlaying == true then
     return
   end
-  seqIndex = gem.inc(seqIndex)
-  spawn(pageRunner, seqIndex)
-  playingIndex = {}
-  for i=1,numParts do
-    --print("Start playing", i)
-    playIndex = gem.inc(playIndex)
-    table.insert(playingIndex, playIndex)
-    spawn(arpeg, i, playIndex)
-  end
   isPlaying = true
+  seqIndex = gem.inc(seqIndex)
+  run(pageRunner, seqIndex)
 end
 
 function stopPlaying()
@@ -1075,6 +1068,13 @@ footerPanel.y = paramsPerPage[1].sequencerPanel.y + paramsPerPage[1].sequencerPa
 --------------------------------------------------------------------------------
 
 function pageRunner(uniqueId)
+  playingIndex = {}
+  for i=1,numParts do
+    --print("Start playing", i)
+    playIndex = gem.inc(playIndex)
+    table.insert(playingIndex, playIndex)
+    spawn(arpeg, playIndex, i)
+  end
   local rounds = 0
   while isPlaying and seqIndex == uniqueId do
     rounds = rounds + 1
@@ -1096,7 +1096,7 @@ function pageRunner(uniqueId)
   end
 end
 
-function arpeg(part, uniqueId)
+function arpeg(uniqueId, part)
   local index = 0
   local partDirectionBackward = false
   while isPlaying and playingIndex[part] == uniqueId do

diff --git a/modular/rythmicFragmentsTrigger.lua b/modular/rythmicFragmentsTrigger.lua
@@ -235,7 +235,6 @@ local function sequenceRunner(uniqueId)
   local partInfo = nil
   local startEvolve = false -- Can be set by part order
   local beatCounter = 1 -- Holds the beat count
-  isPlaying = true
   initVoices()
   while isPlaying and seqIndex == uniqueId do
     print("Playing beat", beatCounter)
@@ -301,6 +300,7 @@ local function startPlaying()
   if isPlaying then
     return
   end
+  isPlaying = true
   seqIndex = gem.inc(seqIndex)
   run(sequenceRunner, seqIndex)
 end

diff --git a/sequencers/stochasticDrumSequencer.lua b/sequencers/stochasticDrumSequencer.lua
@@ -107,16 +107,9 @@ function startPlaying()
   if isPlaying == true then
     return
   end
-  seqIndex = gem.inc(seqIndex)
-  spawn(pageRunner, seqIndex)
-  playingIndex = {}
-  for i=1,numParts do
-    --print("Start playing", i)
-    playIndex = gem.inc(playIndex)
-    table.insert(playingIndex, playIndex)
-    spawn(arpeg, i, playIndex)
-  end
   isPlaying = true
+  seqIndex = gem.inc(seqIndex)
+  run(pageRunner, seqIndex)
 end
 
 function stopPlaying()
@@ -736,6 +729,13 @@ footerPanel.y = paramsPerPage[1].sequencerPanel.y + paramsPerPage[1].sequencerPa
 --------------------------------------------------------------------------------
 
 function pageRunner(uniqueId)
+  playingIndex = {}
+  for i=1,numParts do
+    --print("Start playing", i)
+    playIndex = gem.inc(playIndex)
+    table.insert(playingIndex, playIndex)
+    spawn(arpeg, playIndex, i)
+  end
   local rounds = 0
   while isPlaying and seqIndex == uniqueId do
     rounds = rounds + 1
@@ -757,7 +757,7 @@ function pageRunner(uniqueId)
   end
 end
 
-function arpeg(part, uniqueId)
+function arpeg(uniqueId, part)
   local index = 0
   local partDirectionBackward = false
   while isPlaying and playingIndex[part] == uniqueId do