Skip to content

Commit

Permalink
fix macros
Browse files Browse the repository at this point in the history
  • Loading branch information
schollz committed Feb 26, 2021
1 parent 4601af8 commit 45e1a85
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 7 deletions.
3 changes: 3 additions & 0 deletions lib/grido.lua
Original file line number Diff line number Diff line change
Expand Up @@ -274,6 +274,9 @@ function Grido:toggle_macro_play(on)
end
on = not self.macro_play
end
if on and self.macro_record then
self:toggle_macro_record(false)
end
if on and #self.macro_db == 0 then
on = false
end
Expand Down
17 changes: 10 additions & 7 deletions oooooo.lua
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
-- oooooo v1.8.0
-- oooooo v1.8.1
-- 6 x digital tape loops
--
-- llllllll.co/t/oooooo
Expand Down Expand Up @@ -31,7 +31,8 @@ engine.name="SimpleDelay"

-- from https://github.com/monome/norns/blob/main/lua/lib/intonation.lua
local intonation = {1/1, 16/15, 9/8, 6/5, 5/4, 4/3, 45/32, 3/2, 8/5, 5/3, 16/9, 15/8, 2*1/1, 2*16/15, 2*9/8, 2*6/5, 2*5/4, 2*4/3, 2*45/32, 2*3/2, 2*8/5, 2*5/3, 2*16/9, 2*15/8}

oooooo_grid = nil
kolor_grid = nil
-- user parameters
uP={
-- initialized in init
Expand Down Expand Up @@ -460,7 +461,7 @@ function init()
print("using kolor engine and allowing toggling")
engine.load("SimpleDelayKolor",function()
engine.name="SimpleDelayKolor"
local oooooo_grid = grido:new({grid_on=true,toggleable=true})
oooooo_grid = grido:new({grid_on=true,toggleable=true})
local kolor = include("kolor/lib/kolor")
kolor_grid = kolor:new({grid_on=false,toggleable=true})
kolor_grid:toggle_grid(false)
Expand All @@ -475,7 +476,7 @@ function init()
end)
else
-- simply setup oooooo grid
grido:new()
oooooo_grid = grido:new()
end
-- DEV comment this out
-- params:set("scale_mode",9)
Expand All @@ -485,9 +486,11 @@ end

-- switch between grids on kolor and oooooo
function switch_kolor_oooooo()
local on = oooooo_grid.grid_on
oooooo_grid:toggle_grid(not on)
kolor_grid:toggle_grid(on)
if oooooo_grid ~= nil and kolor_grid ~= nil then
local on = oooooo_grid.grid_on
oooooo_grid:toggle_grid(not on)
kolor_grid:toggle_grid(on)
end
end

function init_loops(j,ignore_pan)
Expand Down

0 comments on commit 45e1a85

Please sign in to comment.