Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion html/css/main.css

Large diffs are not rendered by default.

191 changes: 182 additions & 9 deletions html/css/pedals.css
Original file line number Diff line number Diff line change
Expand Up @@ -295,6 +295,7 @@ body > .mod-settings.mod-window-visible {
position: absolute;
left: 0;
padding: 4px 10px;
margin-top: 5px;
}
.mod-presets .btn {
font-size: 10px;
Expand Down Expand Up @@ -342,14 +343,24 @@ body > .mod-settings.mod-window-visible {
float:left;
height:160px;
margin-bottom:2px;
margin-right:2px;
position:relative;
text-align:center;
width:160px;
}

.mod-pedal-settings .mod-knob-background {
position: absolute;
left: 46px;
top: 42px;
width: 68px;
height: 68px;
overflow: hidden;
border-radius: 50%;
background-color: var(--no-group-color);
}

.mod-pedal-settings .mod-knob > span.mod-knob-current-value {
bottom:12px;
bottom:11px;
font-weight:bold;
left: 38px;
position:absolute;
Expand Down Expand Up @@ -388,9 +399,9 @@ body > .mod-settings.mod-window-visible {
display:block;
font-size:11px;
font-weight:bold;
height:11px;
height:23px;
line-height:1;
margin:9px 0;
padding:6px 0px 3px 0px;
position:relative;
overflow:hidden;
text-transform:uppercase;
Expand Down Expand Up @@ -541,9 +552,9 @@ body > .mod-settings.mod-window-visible {
display:block;
font-size:11px;
font-weight:bold;
height:11px;
height:23px;
line-height:1;
margin:9px 0;
padding:6px 0px 3px 0px;
position:relative;
overflow:hidden;
text-align:center;
Expand Down Expand Up @@ -678,20 +689,29 @@ body > .mod-settings.mod-window-visible {
float:left;
height:160px;
margin-bottom:2px;
margin-right:2px;
position:relative;
text-align:center;
width:160px;
}

.mod-pedal-settings .mod-switch-background {
height: 23px;
left: 81px;
position: absolute;
overflow: hidden;
top: 77px;
width: 44px;
background-color: var(--no-group-color);
}

.mod-pedal-settings .mod-switch > span.mod-switch-title {
color:white;
display:block;
font-size:11px;
font-weight:bold;
height:11px;
height:23px;
line-height:1;
margin:9px 0;
padding:6px 0px 3px 0px;
position:relative;
overflow:hidden;
text-transform:uppercase;
Expand Down Expand Up @@ -892,6 +912,159 @@ body > .mod-settings.mod-window-visible {
width:202px;
}

/* 32 Groups */
:root {
--no-group-color: #883996;;
--group-0-color: #DE7558;
--group-1-color: #16ACA6;
--group-2-color: #74A16B;
--group-3-color: #EC2469;
--group-4-color: #860FDA;
--group-5-color: #D4BA3D;
--group-6-color: #819393;
--group-7-color: #9951BF;
--group-8-color: #DFB6A5;
--group-9-color: #B9A843;
--group-10-color: #81DEA8;
--group-11-color: #AB386B;
--group-12-color: #4D80DD;
--group-13-color: #EBE65A;
--group-14-color: #0B575B;
--group-15-color: #5755F7;
--group-16-color: #3DC745;
--group-17-color: #F51034;
--group-18-color: #84D08B;
--group-19-color: #CAB8B0;
--group-20-color: #425265;
--group-21-color: #341B05;
--group-22-color: #055538;
--group-23-color: #1AE35C;
--group-24-color: #9D0B8E;
--group-25-color: #6F8C9A;
--group-26-color: #F91114;
--group-27-color: #069758;
--group-28-color: #2340B9;
--group-29-color: #3F7CBB;
--group-30-color: #8185D4;
--group-31-color: #080F1F;
}

.mod-pedal-settings .mod-group.mod-group-start > .mod-group-item-title {
border-top-left-radius: 1px;
border-bottom-left-radius: 1px;
}

.mod-pedal-settings .mod-group.mod-group-end > .mod-group-item-title {
/* border-top-right-radius: 1px;
border-bottom-right-radius: 1px; */
}

.mod-pedal-settings .mod-group.mod-group-end {
margin-right:3px;
}

.mod-pedal-settings .mod-group-item-title {
border-top-width: 3px;
border-top-style: solid;
}

.mod-pedal-settings .mod-group-0 > .mod-group-item-title {
border-top-color: var(--group-0-color);
}
.mod-pedal-settings .mod-group-1 > .mod-group-item-title {
border-top-color: var(--group-1-color);
}
.mod-pedal-settings .mod-group-2 > .mod-group-item-title {
border-top-color: var(--group-2-color);
}
.mod-pedal-settings .mod-group-3 > .mod-group-item-title {
border-top-color: var(--group-3-color);
}
.mod-pedal-settings .mod-group-4 > .mod-group-item-title {
border-top-color: var(--group-4-color);
}
.mod-pedal-settings .mod-group-5 > .mod-group-item-title {
border-top-color: var(--group-5-color);
}
.mod-pedal-settings .mod-group-6 > .mod-group-item-title {
border-top-color: var(--group-6-color);
}
.mod-pedal-settings .mod-group-7 > .mod-group-item-title {
border-top-color: var(--group-7-color);
}
.mod-pedal-settings .mod-group-8 > .mod-group-item-title {
border-top-color: var(--group-8-color);
}
.mod-pedal-settings .mod-group-9 > .mod-group-item-title {
border-top-color: var(--group-9-color);
}
.mod-pedal-settings .mod-group-10 > .mod-group-item-title {
border-top-color: var(--group-10-color);
}
.mod-pedal-settings .mod-group-11 > .mod-group-item-title {
border-top-color: var(--group-11-color);
}
.mod-pedal-settings .mod-group-12 > .mod-group-item-title {
border-top-color: var(--group-12-color);
}
.mod-pedal-settings .mod-group-13 > .mod-group-item-title {
border-top-color: var(--group-13-color);
}
.mod-pedal-settings .mod-group-14 > .mod-group-item-title {
border-top-color: var(--group-14-color);
}
.mod-pedal-settings .mod-group-15 > .mod-group-item-title {
border-top-color: var(--group-15-color);
}
.mod-pedal-settings .mod-group-16 > .mod-group-item-title {
border-top-color: var(--group-16-color);
}
.mod-pedal-settings .mod-group-17 > .mod-group-item-title {
border-top-color: var(--group-17-color);
}
.mod-pedal-settings .mod-group-18 > .mod-group-item-title {
border-top-color: var(--group-18-color);
}
.mod-pedal-settings .mod-group-19 > .mod-group-item-title {
border-top-color: var(--group-19-color);
}
.mod-pedal-settings .mod-group-20 > .mod-group-item-title {
border-top-color: var(--group-20-color);
}
.mod-pedal-settings .mod-group-21 > .mod-group-item-title {
border-top-color: var(--group-21-color);
}
.mod-pedal-settings .mod-group-22 > .mod-group-item-title {
border-top-color: var(--group-22-color);
}
.mod-pedal-settings .mod-group-23 > .mod-group-item-title {
border-top-color: var(--group-23-color);
}
.mod-pedal-settings .mod-group-24 > .mod-group-item-title {
border-top-color: var(--group-24-color);
}
.mod-pedal-settings .mod-group-25 > .mod-group-item-title {
border-top-color: var(--group-25-color);
}
.mod-pedal-settings .mod-group-26 > .mod-group-item-title {
border-top-color: var(--group-26-color);
}
.mod-pedal-settings .mod-group-27 > .mod-group-item-title {
border-top-color: var(--group-27-color);
}
.mod-pedal-settings .mod-group-28 > .mod-group-item-title {
border-top-color: var(--group-28-color);
}
.mod-pedal-settings .mod-group-29 > .mod-group-item-title {
border-top-color: var(--group-29-color);
}
.mod-pedal-settings .mod-group-30 > .mod-group-item-title {
border-top-color: var(--group-30-color);
}
.mod-pedal-settings .mod-group-31 > .mod-group-item-title {
border-top-color: var(--group-31-color);
}

/* FIXME put it in the right place */
.mod-pedal.replaceable-drop {
opacity: 0.5;
Expand Down
Binary file modified html/img/knob.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified html/img/switch.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
56 changes: 56 additions & 0 deletions html/js/host.js
Original file line number Diff line number Diff line change
Expand Up @@ -371,6 +371,62 @@ $('document').ready(function() {
success: function (pluginData) {
var instancekey = '[mod-instance="' + instance + '"]'

// resolve groups
pluginData.ports.control.input.forEach(function (port, index) {
const groupUri = port.group;
port.groupIndex = undefined;
port.groupCssIndex = undefined; // index used for css coloring

if (pluginData.portGroups && groupUri) {
port.group = pluginData.portGroups.find(function (group) {
return group.uri === port.group;
});

if (port.group) {
port.groupStart = false;
port.groupEnd = false;
port.groupIndex = pluginData.portGroups.indexOf(port.group);
port.groupCssIndex = port.groupIndex % 32; // 32 = max supported groups by css
}
}
});

// sort port with groups
pluginData.ports.control.input.sort(function (a, b) {
if (a.groupIndex < b.groupIndex) {
return -1;
} else if (a.groupIndex > b.groupIndex) {
return 1;
} else {
return a.index - b.index;
}
});

// add start or end group flags
let prevPort = undefined;
pluginData.ports.control.input.forEach(function (port, index) {
if (port.group)
{
if (prevPort === undefined || prevPort.group === undefined) {
port.groupStart = true;
} else {
if (prevPort.groupIndex != port.groupIndex) {
port.groupStart = true;

if (prevPort.group) {
prevPort.groupEnd = true;
}
}
}
}

prevPort = port;
});

if (prevPort.group) {
prevPort.groupEnd = true;
}

if (!$(instancekey).length) {
var cb = function () {
desktop.pedalboard.pedalboard('scheduleAdapt', false)
Expand Down
25 changes: 19 additions & 6 deletions html/resources/settings.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ <h1 class="alignleft">{{effect.name}}</h1>
<div class="mod-switch bypass">
<span class="mod-switch-title">ON/OFF</span>
<div class="mod-light on" mod-role="bypass-light"></div>
<div class="mod-switch-background"></div>
<div class="mod-switch-image" mod-role="bypass"></div>
<div class="mod-address" mod-role="bypass-address"></div>
</div>
Expand Down Expand Up @@ -94,8 +95,8 @@ <h1 class="alignleft">{{effect.name}}</h1>

{{#effect.ports.control.input}}
{{#enumeration}}
<div class="mod-enumerated">
<span class="mod-enumerated-title">{{shortName}}</span>
<div class="mod-enumerated{{#group}} mod-group{{#groupStart}} mod-group-start{{/groupStart}} mod-group-{{groupCssIndex}}{{#groupEnd}} mod-group-end{{/groupEnd}}{{/group}}">
<span class="mod-enumerated-title{{#group}} mod-group-item-title{{/group}}">{{shortName}}</span>
<div class="mod-address" mod-role="input-control-address" mod-port-symbol="{{symbol}}"></div>
<div class="mod-enumerated-list" mod-role="input-control-port" mod-port-symbol="{{symbol}}" mod-widget="custom-select">
{{#scalePoints}}
Expand All @@ -107,11 +108,17 @@ <h1 class="alignleft">{{effect.name}}</h1>
{{^enumeration}}
{{^trigger}}
{{^toggled}}
<div class="mod-knob" title="{{comment}}">
<span class="mod-knob-title">{{shortName}}</span>
<div class="mod-knob{{#group}} mod-group{{#groupStart}} mod-group-start{{/groupStart}} mod-group-{{groupCssIndex}}{{#groupEnd}} mod-group-end{{/groupEnd}}{{/group}}" title="{{comment}}">
<span class="mod-knob-title{{#group}} mod-group-item-title{{/group}}">{{shortName}}</span>
<span class="mod-knob-min-value" mod-role="input-control-minimum" mod-port-symbol="{{symbol}}"></span>
<span class="mod-knob-max-value" mod-role="input-control-maximum" mod-port-symbol="{{symbol}}"></span>
<span class="mod-knob-current-value" mod-role="input-control-value" mod-port-symbol="{{symbol}}"></span>
{{#group}}
<div class="mod-knob-background" style="background-color: var(--group-{{groupCssIndex}}-color);"></div>
{{/group}}
{{^group}}
<div class="mod-knob-background"></div>
{{/group}}
{{#integer}}
<div class="mod-knob-image mod-knob-image-steps-{{steps}}" mod-role="input-control-port" mod-port-symbol="{{symbol}}" mod-widget="film"></div>
{{/integer}}
Expand All @@ -122,8 +129,14 @@ <h1 class="alignleft">{{effect.name}}</h1>
</div>
{{/toggled}}
{{#toggled}}
<div class="mod-switch" title="{{comment}}">
<span class="mod-switch-title">{{shortName}}</span>
<div class="mod-switch{{#group}} mod-group{{#groupStart}} mod-group-start{{/groupStart}} mod-group-{{groupCssIndex}}{{#groupEnd}} mod-group-end{{/groupEnd}}{{/group}}" title="{{comment}}">
<span class="mod-switch-title{{#group}} mod-group-item-title{{/group}}">{{shortName}}</span>
{{#group}}
<div class="mod-switch-background" style="background-color: var(--group-{{groupCssIndex}}-color);"></div>
{{/group}}
{{^group}}
<div class="mod-switch-background"></div>
{{/group}}
<div class="mod-switch-image" mod-role="input-control-port" mod-port-symbol="{{symbol}}" mod-widget="film"></div>
<div class="mod-address" mod-role="input-control-address" mod-port-symbol="{{symbol}}"></div>
</div>
Expand Down
1 change: 1 addition & 0 deletions modtools/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,7 @@ class PluginGUI_Mini(Structure):
class PluginPortGroup(Structure):
_fields_ = [
("valid", c_bool),
("uri", c_char_p),
("symbol", c_char_p),
("name", c_char_p),
]
Expand Down