From b61b9eb66ccf0cbe8025218b78836d8deac32e15 Mon Sep 17 00:00:00 2001
From: Pierre Ranwez <pierre.ranwez.etu@univ-lille.fr>
Date: Mon, 31 Jan 2022 18:26:15 +0100
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20bug:=20range=20parse=20int?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
content.js | 25 ++++++++++---------------
1 file changed, 10 insertions(+), 15 deletions(-)
diff --git a/content.js b/content.js
index d71029a..82cae17 100644
--- a/content.js
+++ b/content.js
@@ -156,7 +156,7 @@ function midiEvent(type, data) {
midiValue = data.value;
templates = templateToDict(event['value']);
templates.forEach(template => {
- midiValue = midiValue * template['max'];
+ midiValue =(template['min'] + ((template['max']-template['min'])*midiValue));
if (type == 'noteon' && template['eventType'] == 'noteon' && template['eventName'] == data.note.name) {
value = event['value'].replace('[' + template['templateFull'] + ']', midiValue);
let els = document.querySelectorAll(event['selector']);
@@ -430,21 +430,17 @@ function audioEvent() {
if (min == 0) {
min = 1;
}
- if (template['eventType'] == 'energy' && template['eventName'] == 'bass') {
- eventIn = true;
- value = value.replace('[' + template['templateFull'] + ']', (energies['bass'] * min + (template['max'] - template['min'])));
- }
- if (template['eventType'] == 'energy' && template['eventName'] == 'mid') {
- eventIn = true;
- value = value.replace('[' + template['templateFull'] + ']', (energies['mid'] * min + (template['max'] - template['min'])));
- }
- if (template['eventType'] == 'energy' && template['eventName'] == 'treble') {
- eventIn = true;
- value = value.replace('[' + template['templateFull'] + ']', (energies['treble'] * min + (template['max'] - template['min'])));
- }
+ Object.keys(presets).forEach(preset => {
+ if (template['eventType'] == 'energy' && template['eventName'] == preset) {
+ eventIn = true;
+ value = value.replace('[' + template['templateFull'] + ']', parseInt(template['min'])+Math.round((template['max']-template['min'])*energies[preset]));
+ }
+ });
if (template['eventType'] == 'meter' && template['eventName'] == 'volume') {
eventIn = true;
- value = value.replace('[' + template['templateFull'] + ']', (meter.volume * template['max']));
+ volume = meter.volume * 1.4;
+ // value = value.replace('[' + template['templateFull'] + ']', (template['max'] * meter.volume));
+ value = value.replace('[' + template['templateFull'] + ']', (meter.volume * 1.4<1?parseInt(template['min'])+Math.round((template['max']-template['min'])*volume):0));
}
if (event['value'].includes('[audio.noteon.' + noteStrings[note % 12] + ']')) {
eventIn = true;
@@ -457,7 +453,6 @@ function audioEvent() {
});
if (eventIn) {
let els = document.querySelectorAll(event['selector']);
- console.log(value);
els.forEach(e => {
e.style[event['property']] = value;
});
--
GitLab