Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
rename ext to engine. lua only, not matron glue
- Loading branch information
Showing
with
15 additions
and
15 deletions.
-
+5
−5
lua/core/audio.lua
-
+3
−3
lua/core/menu.lua
-
+7
−7
lua/core/mix.lua
|
|
@@ -22,7 +22,7 @@ Audio.level_dac = function(level) |
|
|
_norns.level_dac(level) |
|
|
end |
|
|
|
|
|
Audio.level_ext = function(level) |
|
|
Audio.level_eng = function(level) |
|
|
_norns.level_ext(level) |
|
|
end |
|
|
|
|
|
@@ -92,9 +92,9 @@ function Audio.level_monitor_rev(val) |
|
|
_norns.level_monitor_rev(val) |
|
|
end |
|
|
|
|
|
--- reverb EXT level. |
|
|
--- reverb ENGINE level. |
|
|
-- @param val |
|
|
function Audio.level_ext_rev(val) |
|
|
function Audio.level_eng_rev(val) |
|
|
_norns.level_ext_rev(val) |
|
|
end |
|
|
|
|
|
@@ -181,9 +181,9 @@ Audio.level_adc_cut = function(value) |
|
|
_norns.level_adc_cut(value) |
|
|
end |
|
|
|
|
|
--- softcut ext level. |
|
|
--- softcut eng level. |
|
|
-- @param value |
|
|
Audio.level_ext_cut = function(value) |
|
|
Audio.level_eng_cut = function(value) |
|
|
_norns.level_ext_cut(value) |
|
|
end |
|
|
|
|
|
|
|
|
@@ -1303,7 +1303,7 @@ end |
|
|
|
|
|
m.enc[pMIX] = function(n,d) |
|
|
local ch1 = {"output", "monitor", "softcut"} |
|
|
local ch2 = {"input", "ext", "tape"} |
|
|
local ch2 = {"input", "engine", "tape"} |
|
|
|
|
|
if n==2 then |
|
|
mix:delta(ch1[m.mix.sel],d) |
|
|
@@ -1354,7 +1354,7 @@ m.redraw[pMIX] = function() |
|
|
screen.stroke() |
|
|
|
|
|
screen.level(2) |
|
|
n = mix:get_raw("ext")*48 |
|
|
n = mix:get_raw("engine")*48 |
|
|
screen.rect(x+108.5,55.5,2,-n) |
|
|
screen.stroke() |
|
|
|
|
|
@@ -1377,7 +1377,7 @@ m.redraw[pMIX] = function() |
|
|
screen.move(46,63) |
|
|
screen.text("mon") |
|
|
screen.move(68,63) |
|
|
screen.text("ext") |
|
|
screen.text("eng") |
|
|
screen.level(m.mix.sel==3 and 15 or 1) |
|
|
screen.move(90,63) |
|
|
screen.text("cut") |
|
|
|
|
|
@@ -14,9 +14,9 @@ local cs_MUTE_LEVEL = cs.new(-math.huge,0,'db',0,-math.huge,"dB") |
|
|
mix:add_control("monitor", "monitor", cs_MUTE_LEVEL) |
|
|
mix:set_action("monitor", |
|
|
function(x) audio.level_monitor(util.dbamp(x)) end) |
|
|
mix:add_control("ext", "ext", cs_MAIN_LEVEL) |
|
|
mix:set_action("ext", |
|
|
function(x) audio.level_ext(util.dbamp(x)) end) |
|
|
mix:add_control("engine", "engine", cs_MAIN_LEVEL) |
|
|
mix:set_action("engine", |
|
|
function(x) audio.level_eng(util.dbamp(x)) end) |
|
|
mix:add_control("softcut", "softcut", cs_MAIN_LEVEL) |
|
|
mix:set_action("softcut", |
|
|
function(x) audio.level_cut(util.dbamp(x)) end) |
|
|
@@ -53,11 +53,11 @@ local cs_DB_LEVEL = cs.new(-math.huge,18,'db',0,0,"dB") |
|
|
local cs_DB_LEVEL_MUTE = cs.new(-math.huge,18,'db',0,-math.huge,"dB") |
|
|
local cs_DB_LEVEL_9DB = cs.new(-math.huge,18,'db',0,-9,"dB") |
|
|
|
|
|
mix:add_control("rev_ext_input", "rev ext input", cs_DB_LEVEL_9DB) |
|
|
mix:set_action("rev_ext_input", |
|
|
function(x) audio.level_ext_rev(util.dbamp(x)) end) |
|
|
mix:add_control("rev_eng_input", "rev eng input", cs_DB_LEVEL_9DB) |
|
|
mix:set_action("rev_eng_input", |
|
|
function(x) audio.level_eng_rev(util.dbamp(x)) end) |
|
|
|
|
|
mix:add_control("rev_cut_input", "rev cut input", cs_DB_LEVEL_MUTE) |
|
|
mix:add_control("rev_cut_input", "rev cut input", cs_DB_LEVEL_9DB) |
|
|
mix:set_action("rev_cut_input", |
|
|
function(x) audio.level_cut_rev(util.dbamp(x)) end) |
|
|
|
|
|
|