diff --git a/modules/gin b/modules/gin index 70a7820..27acb3c 160000 --- a/modules/gin +++ b/modules/gin @@ -1 +1 @@ -Subproject commit 70a782087eeb4de81865fd0dbfc4c30a2473255b +Subproject commit 27acb3cfddcd79a653e080d081da930b6d656ccf diff --git a/modules/juce b/modules/juce index 2efd3e0..e3f3d32 160000 --- a/modules/juce +++ b/modules/juce @@ -1 +1 @@ -Subproject commit 2efd3e066102b7f8d4928f8095fddc182b982da8 +Subproject commit e3f3d32fe64fb6ac9055bc1c304caae01a5032e5 diff --git a/plugin/Resources/layout.json b/plugin/Resources/layout.json index ff8377b..262e944 100644 --- a/plugin/Resources/layout.json +++ b/plugin/Resources/layout.json @@ -1,198 +1,198 @@ { - "children": + "components": [ - { "id": "osc[1..2]", "x": "0,prevR()+1", "y": 0, "w": "parW()/2", "h": 163, "children": + { "id": "osc[1..2]", "x": "0,prevR+1", "y": 0, "w": "parW/2", "h": 163, "components": [ - { "id": "Retrig", "r": "parW() - 6", "y": 6, "w": 12, "h": 12 }, + { "id": "Retrig", "r": "parW - 6", "y": 6, "w": 12, "h": 12 }, { "id": "Pos", "x": 0, "y": 23, "w": 56, "h": 70 }, - { "id": "Tune", "x": "prevR()", "y": 23, "w": 56, "h": 70 }, - { "id": "Fine", "x": "prevR()", "y": 23, "w": 56, "h": 70 }, - { "id": "Level", "x": "prevR()", "y": 23, "w": 56, "h": 70 }, - { "id": "Pan", "x": "prevR()", "y": 23, "w": 56, "h": 70 }, - { "id": "Unison", "x": 0, "y": "prevB()", "w": 56, "h": 70 }, - { "id": "Detune", "x": "prevR()", "y": "prevY()", "w": 56, "h": 70 }, - { "id": "Spread", "x": "prevR()", "y": "prevY()", "w": 56, "h": 70 }, - { "id": "Formant", "x": "prevR()", "y": "prevY()", "w": 56, "h": 70 }, - { "id": "Bend", "x": "prevR()", "y": "prevY()", "w": 56, "h": 70 }, - { "id": "wt", "x": "prevR()", "y": 23, "r": "parW()", "b": "parH()" }, - { "id": "add", "r": "parW() - 8", "b": "parH() - 8", "w": 16, "h": 16 } - ] + { "id": "Tune", "x": "prevR", "y": 23, "w": 56, "h": 70 }, + { "id": "Fine", "x": "prevR", "y": 23, "w": 56, "h": 70 }, + { "id": "Level", "x": "prevR", "y": 23, "w": 56, "h": 70 }, + { "id": "Pan", "x": "prevR", "y": 23, "w": 56, "h": 70 }, + { "id": "Unison", "x": 0, "y": "prevB", "w": 56, "h": 70 }, + { "id": "Detune", "x": "prevR", "y": "prevY", "w": 56, "h": 70 }, + { "id": "Spread", "x": "prevR", "y": "prevY", "w": 56, "h": 70 }, + { "id": "Formant", "x": "prevR", "y": "prevY", "w": 56, "h": 70 }, + { "id": "Bend", "x": "prevR", "y": "prevY", "w": 56, "h": 70 }, + { "id": "wt", "x": "prevR", "y": 23, "r": "parW", "b": "parH" }, + { "id": "add", "r": "parW - 8", "b": "parH - 8", "w": 16, "h": 16 } + ] }, - { "id": "noise", "x": "0", "y": "prevB()+1", "w": 120, "h": 163, "children": + { "id": "noise", "x": "0", "y": "prevB+1", "w": 120, "h": 163, "components": [ { "id": "Type", "x": "56/2", "y": 23, "w": 56, "h": 70 }, - { "id": "Level", "x": 0, "y": "prevB()", "w": 56, "h": 70 }, - { "id": "Pan", "x": "prevR()", "y": "prevY()", "w": 56, "h": 70 } - ] + { "id": "Level", "x": 0, "y": "prevB", "w": 56, "h": 70 }, + { "id": "Pan", "x": "prevR", "y": "prevY", "w": 56, "h": 70 } + ] }, - { "id": "sub", "x": "prevR()+1", "y": "prevY()", "w": 112, "h": 163, "children": + { "id": "sub", "x": "prevR+1", "y": "prevY", "w": 112, "h": 163, "components": [ - { "id": "Retrig", "r": "parW() - 6", "y": 6, "w": 12, "h": 12 }, + { "id": "Retrig", "r": "parW - 6", "y": 6, "w": 12, "h": 12 }, { "id": "Wave", "x": 0, "y": 23, "w": 56, "h": 70 }, - { "id": "Tune", "x": "prevR()", "y": 23, "w": 56, "h": 70 }, - { "id": "Level", "x": 0, "y": "prevB()", "w": 56, "h": 70 }, - { "id": "Pan", "x": "prevR()", "y": "prevY()", "w": 56, "h": 70 } - ] + { "id": "Tune", "x": "prevR", "y": 23, "w": 56, "h": 70 }, + { "id": "Level", "x": 0, "y": "prevB", "w": 56, "h": 70 }, + { "id": "Pan", "x": "prevR", "y": "prevY", "w": 56, "h": 70 } + ] }, - { "id": "flt", "x": "prevR()+1", "y": "prevY()", "w": 336, "h": 163, "children": + { "id": "flt", "x": "prevR+1", "y": "prevY", "w": 336, "h": 163, "components": [ { "id": "FLT WT1", "x": 24, "y": 6, "w": 12, "h": 12 }, - { "id": "FLT WT2", "x": "prevR()+6", "y": 6, "w": 12, "h": 12 }, - { "id": "FLT noise", "x": "prevR()+6", "y": 6, "w": 12, "h": 12 }, - { "id": "FLT sub", "x": "prevR()+6", "y": 6, "w": 12, "h": 12 }, + { "id": "FLT WT2", "x": "prevR+6", "y": 6, "w": 12, "h": 12 }, + { "id": "FLT noise", "x": "prevR+6", "y": 6, "w": 12, "h": 12 }, + { "id": "FLT sub", "x": "prevR+6", "y": 6, "w": 12, "h": 12 }, { "id": "Type", "x": 0, "y": 23, "w": 56, "h": 70 }, - { "id": "Freq", "x": "prevR()", "y": 23, "w": 56, "h": 70 }, - { "id": "Res", "x": "prevR()", "y": 23, "w": 56, "h": 70 }, - { "id": "Key", "x": 0, "y": "prevB()", "w": 56, "h": 70 }, - { "id": "Amnt", "x": "prevR()", "y": "prevY()", "w": 56, "h": 70 }, - { "id": "Vel", "x": "prevR()", "y": "prevY()", "w": 56, "h": 70 }, - { "id": "A", "x": "prevR()", "y": "prevY() + 13", "w": 42, "h": 57 }, - { "id": "D", "x": "prevR()", "y": "prevY()", "w": 42, "h": 57 }, - { "id": "S", "x": "prevR()", "y": "prevY()", "w": 42, "h": 57 }, - { "id": "R", "x": "prevR()", "y": "prevY()", "w": 42, "h": 57 }, + { "id": "Freq", "x": "prevR", "y": 23, "w": 56, "h": 70 }, + { "id": "Res", "x": "prevR", "y": 23, "w": 56, "h": 70 }, + { "id": "Key", "x": 0, "y": "prevB", "w": 56, "h": 70 }, + { "id": "Amnt", "x": "prevR", "y": "prevY", "w": 56, "h": 70 }, + { "id": "Vel", "x": "prevR", "y": "prevY", "w": 56, "h": 70 }, + { "id": "A", "x": "prevR", "y": "prevY + 13", "w": 42, "h": 57 }, + { "id": "D", "x": "prevR", "y": "prevY", "w": 42, "h": 57 }, + { "id": "S", "x": "prevR", "y": "prevY", "w": 42, "h": 57 }, + { "id": "R", "x": "prevR", "y": "prevY", "w": 42, "h": 57 }, { "id": "adsr", "x": "getX('A')", "y": "getY('Res')", "r": "getR('R')", "b": "getY('A')" }, { "id": "Retrig", "r": "getR('adsr') - 3", "y": "getY('adsr') + 3", "w": 12, "h": 12 } ] }, - { "id": "adsr", "x": "prevR()+1", "y": "prevY()", "w": "210 + 160", "h": 163, "children": + { "id": "adsr", "x": "prevR+1", "y": "prevY", "w": "210 + 160", "h": 163, "components": [ { "id": "A", "x": "160/2", "y": 106, "w": 42, "h": 57 }, - { "id": "D", "x": "prevR()", "y": "prevY()", "w": 42, "h": 57 }, - { "id": "S", "x": "prevR()", "y": "prevY()", "w": 42, "h": 57 }, - { "id": "R", "x": "prevR()", "y": "prevY()", "w": 42, "h": 57 }, - { "id": "Vel", "x": "prevR()", "y": "prevY()", "w": 42, "h": 57 }, - { "id": "adsr", "x": 0, "y": 23, "r": "parW()", "b": "getY('A')" }, + { "id": "D", "x": "prevR", "y": "prevY", "w": 42, "h": 57 }, + { "id": "S", "x": "prevR", "y": "prevY", "w": 42, "h": 57 }, + { "id": "R", "x": "prevR", "y": "prevY", "w": 42, "h": 57 }, + { "id": "Vel", "x": "prevR", "y": "prevY", "w": 42, "h": 57 }, + { "id": "adsr", "x": 0, "y": 23, "r": "parW", "b": "getY('A')" }, { "id": "Retrig", "r": "getR('adsr') - 3", "y": "getY('adsr') + 3", "w": 12, "h": 12 } ] }, - { "id": "lfo[1..3]", "x": 0, "y": "prevB()+1,prevY()", "w": 280, "h": 163, "children": + { "id": "lfo[1..3]", "x": 0, "y": "prevB+1,prevY", "w": 280, "h": 163, "components": [ { "id": "Sync", "x": 0, "y": 23, "w": 56, "h": 70 }, - { "id": "Beat", "x": "prevR()", "y": 23, "w": 56, "h": 70 }, - { "id": "Rate", "x": "prevX()", "y": 23, "w": 56, "h": 70 }, - { "id": "Wave", "x": 0, "y": "prevB()", "w": 56, "h": 70 }, - { "id": "Depth", "x": "prevR()", "y": "prevY()", "w": 56, "h": 70 }, - { "id": "Offset", "x": "prevR()", "y": "prevY() + 13", "w": 42, "h": 57 }, - { "id": "Phase", "x": "prevR()", "y": "prevY()", "w": 42, "h": 57 }, - { "id": "Delay", "x": "prevR()", "y": "prevY()", "w": 42, "h": 57 }, - { "id": "Fade", "x": "prevR()", "y": "prevY()", "w": 42, "h": 57 }, + { "id": "Beat", "x": "prevR", "y": 23, "w": 56, "h": 70 }, + { "id": "Rate", "x": "prevX", "y": 23, "w": 56, "h": 70 }, + { "id": "Wave", "x": 0, "y": "prevB", "w": 56, "h": 70 }, + { "id": "Depth", "x": "prevR", "y": "prevY", "w": 56, "h": 70 }, + { "id": "Offset", "x": "prevR", "y": "prevY + 13", "w": 42, "h": 57 }, + { "id": "Phase", "x": "prevR", "y": "prevY", "w": 42, "h": 57 }, + { "id": "Delay", "x": "prevR", "y": "prevY", "w": 42, "h": 57 }, + { "id": "Fade", "x": "prevR", "y": "prevY", "w": 42, "h": 57 }, { "id": "lfo", "x": "getX('Offset')", "y": "getY('Rate')", "r": "getR('Fade')", "b": "getY('Fade')" }, { "id": "Retrig", "r": "getR('lfo') - 3", "y": "getY('lfo') + 3", "w": 12, "h": 12 } ] }, - { "id": "env[1..3]", "x": "getR('lfo1')+1", "y": "prevY()", "w": "168 + 50", "h": 163, "children": + { "id": "env[1..3]", "x": "getR('lfo1')+1", "y": "prevY", "w": "168 + 50", "h": 163, "components": [ { "id": "A", "x": 25, "y": 106, "w": 42, "h": 57 }, - { "id": "D", "x": "prevR()", "y": "prevY()", "w": 42, "h": 57 }, - { "id": "S", "x": "prevR()", "y": "prevY()", "w": 42, "h": 57 }, - { "id": "R", "x": "prevR()", "y": "prevY()", "w": 42, "h": 57 }, - { "id": "adsr", "x": 0, "y": 23, "r": "parW()", "b": "getY('A')" }, + { "id": "D", "x": "prevR", "y": "prevY", "w": 42, "h": 57 }, + { "id": "S", "x": "prevR", "y": "prevY", "w": 42, "h": 57 }, + { "id": "R", "x": "prevR", "y": "prevY", "w": 42, "h": 57 }, + { "id": "adsr", "x": 0, "y": 23, "r": "parW", "b": "getY('A')" }, { "id": "Retrig", "r": "getR('adsr') - 3", "y": "getY('adsr') + 3", "w": 12, "h": 12 } ] }, - { "id": "step", "x": "prevR()+1", "y": "prevY()", "w": 218, "h": 163, "children": + { "id": "step", "x": "prevR+1", "y": "prevY", "w": 218, "h": 163, "components": [ - { "id": "step", "x": 0, "y": 23, "r": "parW()", "h": 83 }, + { "id": "step", "x": 0, "y": 23, "r": "parW", "h": 83 }, { "id": "Beat", "x": 67, "y": 106, "w": 42, "h": 57 }, - { "id": "Length", "x": "prevR()", "y": "prevY()", "w": 42, "h": 57 }, + { "id": "Length", "x": "prevR", "y": "prevY", "w": 42, "h": 57 }, { "id": "Retrig", "r": "getR('step') - 3", "y": "getY('step') + 3", "w": 12, "h": 12 } ] }, - { "id": "mod", "x": "prevR()+1", "y": "prevY()", "r": "parW()", "h": 163, "children": + { "id": "mod", "x": "prevR+1", "y": "prevY", "r": "parW", "h": 163, "components": [ - { "id": "modlist", "x": 0, "y": 23, "r": "parW()", "b": "parH()" } - ] + { "id": "modlist", "x": 0, "y": 23, "r": "parW", "b": "parH" } + ] }, - { "id": "mtx", "x": "prevX()", "y": "prevY()", "r": "parR()", "h": 163, "children": + { "id": "mtx", "x": "prevX", "y": "prevY", "r": "parR", "h": 163, "components": [ - { "id": "matrix", "x": 0, "y": 23, "r": "parW()", "b": "parH()" } - ] + { "id": "matrix", "x": 0, "y": 23, "r": "parW", "b": "parH" } + ] }, - { "id": "fx", "x": 0, "y": "prevB()+1", "w": "parW() - 169", "h": 137, "children": + { "id": "fx", "x": 0, "y": "prevB+1", "w": "parW - 169", "h": 137, "components": [ - { "id": "gate", "x": "0", "y": 0, "w": 306, "h": 137, "children": + { "id": "gate", "x": "0", "y": 0, "w": 306, "h": 137, "components": [ { "id": "Beat", "x": 69, "y": 30, "w": 42, "h": 57 }, - { "id": "Length", "x": "prevR()", "y": "prevY()", "w": 42, "h": 57 }, - { "id": "A", "x": "prevR()", "y": "prevY()", "w": 42, "h": 57 }, - { "id": "R", "x": "prevR()", "y": "prevY()", "w": 42, "h": 57 }, - { "id": "pattern", "x": 2, "y": "prevB() + 5", "w": "parW() - 6", "b": "parH() - 15" } - ] + { "id": "Length", "x": "prevR", "y": "prevY", "w": 42, "h": 57 }, + { "id": "A", "x": "prevR", "y": "prevY", "w": 42, "h": 57 }, + { "id": "R", "x": "prevR", "y": "prevY", "w": 42, "h": 57 }, + { "id": "pattern", "x": 2, "y": "prevB + 5", "w": "parW - 6", "b": "parH - 15" } + ] }, - { "id": "chorus", "x": "prevR()+1", "y": "prevY()", "w": 126, "h": 137, "children": + { "id": "chorus", "x": "prevR+1", "y": "prevY", "w": 126, "h": 137, "components": [ { "id": "Delay", "x": 0, "y": 23, "w": 42, "h": 57 }, - { "id": "Speed", "x": "prevR()", "y": "prevY()", "w": 42, "h": 57 }, - { "id": "Mix", "x": "prevR()", "y": "prevY()", "w": 42, "h": 57 }, - { "id": "Depth", "x": 21, "y": "prevB()", "w": 42, "h": 57 }, - { "id": "Width", "x": "prevR()", "y": "prevY()", "w": 42, "h": 57 } - ] + { "id": "Speed", "x": "prevR", "y": "prevY", "w": 42, "h": 57 }, + { "id": "Mix", "x": "prevR", "y": "prevY", "w": 42, "h": 57 }, + { "id": "Depth", "x": 21, "y": "prevB", "w": 42, "h": 57 }, + { "id": "Width", "x": "prevR", "y": "prevY", "w": 42, "h": 57 } + ] }, - { "id": "distort", "x": "prevR()+1", "y": "prevY()", "w": 84, "h": 137, "children": + { "id": "distort", "x": "prevR+1", "y": "prevY", "w": 84, "h": 137, "components": [ - { "id": "Distort", "children": + { "id": "Distort", "components": [ - { "id": "mode", "r": "parW() - 4", "y": 4, "w": 16, "h": 16 } + { "id": "mode", "r": "parW - 4", "y": 4, "w": 16, "h": 16 } ] }, - { "id": "page1", "bounds": "parent", "children": + { "id": "page1", "bounds": "parent", "components": [ { "id": "Amount", "x": 14, "y": "23 + 22", "w": 56, "h": 70 } ] }, - { "id": "page2", "bounds": "parent", "children": + { "id": "page2", "bounds": "parent", "components": [ { "id": "Rate", "x": 0, "y": 23, "w": 42, "h": 57 }, - { "id": "Rez", "x": "prevR()", "y": "prevY()", "w": 42, "h": 57 }, - { "id": "Hard", "x": 0, "y": "prevB()", "w": 42, "h": 57 }, - { "id": "Mix", "x": "prevR()", "y": "prevY()", "w": 42, "h": 57 } + { "id": "Rez", "x": "prevR", "y": "prevY", "w": 42, "h": 57 }, + { "id": "Hard", "x": 0, "y": "prevB", "w": 42, "h": 57 }, + { "id": "Mix", "x": "prevR", "y": "prevY", "w": 42, "h": 57 } ] }, - { "id": "page3", "bounds": "parent", "children": + { "id": "page3", "bounds": "parent", "components": [ { "id": "Gain", "x": 0, "y": 23, "w": 42, "h": 57 }, - { "id": "Tone", "x": "prevR()", "y": "prevY()", "w": 42, "h": 57 }, - { "id": "Output", "x": 0, "y": "prevB()", "w": 42, "h": 57 }, - { "id": "Mix", "x": "prevR()", "y": "prevY()", "w": 42, "h": 57 } + { "id": "Tone", "x": "prevR", "y": "prevY", "w": 42, "h": 57 }, + { "id": "Output", "x": 0, "y": "prevB", "w": 42, "h": 57 }, + { "id": "Mix", "x": "prevR", "y": "prevY", "w": 42, "h": 57 } ] }, - { "id": "page4", "bounds": "parent", "children": + { "id": "page4", "bounds": "parent", "components": [ { "id": "Gain", "x": 0, "y": 23, "w": 42, "h": 57 }, - { "id": "Tone", "x": "prevR()", "y": "prevY()", "w": 42, "h": 57 }, - { "id": "Output", "x": 0, "y": "prevB()", "w": 42, "h": 57 }, - { "id": "Mix", "x": "prevR()", "y": "prevY()", "w": 42, "h": 57 } + { "id": "Tone", "x": "prevR", "y": "prevY", "w": 42, "h": 57 }, + { "id": "Output", "x": 0, "y": "prevB", "w": 42, "h": 57 }, + { "id": "Mix", "x": "prevR", "y": "prevY", "w": 42, "h": 57 } ] } - ] + ] }, - { "id": "delay", "x": "prevR()+1", "y": "prevY()", "w": 126, "h": 137, "children": + { "id": "delay", "x": "prevR+1", "y": "prevY", "w": 126, "h": 137, "components": [ { "id": "Sync", "x": 0, "y": 23, "w": 42, "h": 57 }, - { "id": "Delay1", "x": "prevR()", "y": "prevY()", "w": 42, "h": 57 }, - { "id": "Delay2", "x": "prevX()", "y": "prevY()", "w": 42, "h": 57 }, - { "id": "Mix", "x": "prevR()", "y": "prevY()", "w": 42, "h": 57 }, - { "id": "FB", "x": 21, "y": "prevB()", "w": 42, "h": 57 }, - { "id": "CF", "x": "prevR()", "y": "prevY()", "w": 42, "h": 57 } + { "id": "Delay1", "x": "prevR", "y": "prevY", "w": 42, "h": 57 }, + { "id": "Delay2", "x": "prevX", "y": "prevY", "w": 42, "h": 57 }, + { "id": "Mix", "x": "prevR", "y": "prevY", "w": 42, "h": 57 }, + { "id": "FB", "x": 21, "y": "prevB", "w": 42, "h": 57 }, + { "id": "CF", "x": "prevR", "y": "prevY", "w": 42, "h": 57 } ] }, - { "id": "reverb", "x": "prevR()+1", "y": "prevY()", "w": 126, "h": 137, "children": + { "id": "reverb", "x": "prevR+1", "y": "prevY", "w": 126, "h": 137, "components": [ { "id": "Size", "x": 0, "y": 23, "w": 42, "h": 57 }, - { "id": "Decay", "x": "prevR()", "y": "prevY()", "w": 42, "h": 57 }, - { "id": "Lowpass", "x": "prevR()", "y": "prevY()", "w": 42, "h": 57 }, - { "id": "Damping", "x": 0, "y": "prevB()", "w": 42, "h": 57 }, - { "id": "Predelay", "x": "prevR()", "y": "prevY()", "w": 42, "h": 57 }, - { "id": "Mix", "x": "prevR()", "y": "prevY()", "w": 42, "h": 57 } + { "id": "Decay", "x": "prevR", "y": "prevY", "w": 42, "h": 57 }, + { "id": "Lowpass", "x": "prevR", "y": "prevY", "w": 42, "h": 57 }, + { "id": "Damping", "x": 0, "y": "prevB", "w": 42, "h": 57 }, + { "id": "Predelay", "x": "prevR", "y": "prevY", "w": 42, "h": 57 }, + { "id": "Mix", "x": "prevR", "y": "prevY", "w": 42, "h": 57 } ] } ] }, - { "id": "global", "x": "prevR()+1", "y": "prevY()", "w": 168, "h": 137, "children": + { "id": "global", "x": "prevR+1", "y": "prevY", "w": 168, "h": 137, "components": [ { "id": "Mono", "x": 0, "y": 23, "w": 42, "h": 57 }, - { "id": "Glide", "x": "prevR()", "y": "prevY()", "w": 42, "h": 57 }, - { "id": "Time", "x": "prevR()", "y": "prevY()", "w": 42, "h": 57 }, - { "id": "Legato", "x": "prevR()", "y": "prevY()", "w": 42, "h": 57 }, - { "id": "PB Range", "x": 0, "y": "prevB()", "w": 42, "h": 57 }, - { "id": "Voices", "x": "prevR()", "y": "prevY()", "w": 42, "h": 57 }, - { "id": "Level", "x": "prevR() + 42", "y": "prevY()", "w": 42, "h": 57 } - ] + { "id": "Glide", "x": "prevR", "y": "prevY", "w": 42, "h": 57 }, + { "id": "Time", "x": "prevR", "y": "prevY", "w": 42, "h": 57 }, + { "id": "Legato", "x": "prevR", "y": "prevY", "w": 42, "h": 57 }, + { "id": "PB Range", "x": 0, "y": "prevB", "w": 42, "h": 57 }, + { "id": "Voices", "x": "prevR", "y": "prevY", "w": 42, "h": 57 }, + { "id": "Level", "x": "prevR + 42", "y": "prevY", "w": 42, "h": 57 } + ] } ] } \ No newline at end of file diff --git a/plugin/Source/App.cpp b/plugin/Source/App.cpp index 21aeca2..8804074 100644 --- a/plugin/Source/App.cpp +++ b/plugin/Source/App.cpp @@ -57,17 +57,4 @@ static void profile (juce::PropertiesFile& settings) printf ("Elapsed time: %.2fs\n", (end - start) / 1000); } -juce::JUCEApplicationBase* juce_CreateApplication() -{ - return new gin::StandaloneApp([] (juce::PropertiesFile& settings) - { - if (juce::JUCEApplication::getCommandLineParameters ().contains ("-profile")) - { - profile (settings); - return false; - } - return true; - }); -} - #endif diff --git a/plugin/Source/Editor.cpp b/plugin/Source/Editor.cpp index 30fe765..2fef8d2 100644 --- a/plugin/Source/Editor.cpp +++ b/plugin/Source/Editor.cpp @@ -98,9 +98,9 @@ void Editor::resized() #if JUCE_DEBUG auto f = juce::File (__FILE__).getChildFile ("../../Resources/layout.json"); - layout.setLayout ("layout.json", f); + layout.setLayout ({f}); #else - layout.setLayout ("layout.json"); + layout.setLayout ({"layout.json"}); #endif handleAsyncUpdate(); diff --git a/plugin/Source/Editor.h b/plugin/Source/Editor.h index d5ea700..941bd74 100644 --- a/plugin/Source/Editor.h +++ b/plugin/Source/Editor.h @@ -44,5 +44,5 @@ private: gin::ComponentGrid fx { "fx" }; - gin::Layout layout { *this }; + gin::LayoutSupport layout { *this }; };