add spectral synthesis option

fix osc_relay
grz0zrg · Sep 8, 2017 · b5ee536 · b5ee536
1 parent dda0d04
commit b5ee536
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 14 deletions.
diff --git a/README.md b/README.md
@@ -157,7 +157,7 @@ Client :
 
 Papers :
  * [The Scientist and Engineer's Guide to Digital Signal Processing](http://www.dspguide.com)
- * [Welsh's Synthesizer Cookbook](http://www.synthesizer-cookbook.com)
+ * [L'audionumérique 3°ed by Curtis Road](http://www.audionumerique.com/)
  * [Fabrice Neyret Desmos page](http://www-evasion.imag.fr/Membres/Fabrice.Neyret/demos/DesmosGraph/indexImages.html)
 
 Servers :

diff --git a/client/dist/fs.js b/client/dist/fs.js
@@ -18238,7 +18238,7 @@ var _frame = function (raf_time) {
 
                 // and prev_data
                 for (i = 0; i < _output_channels; i += 1) {
-                    buffer_osc.push(_prev_data[i]);
+                    buffer_osc.push(new _synth_data_array(_prev_data[i]));
                 }
 
                 _oscNotifyFast(_OSC_FRAME_DATA, buffer_osc);
@@ -20696,6 +20696,7 @@ var _createFasSettingsContent = function () {
         chn_synthesis_select,
         granular_option,
         additive_option,
+        spectral_option,
         exp_option,
         chn_genv_type_label,
         chn_genv_type_select,
@@ -20721,9 +20722,11 @@ var _createFasSettingsContent = function () {
         chn_synthesis_select = document.createElement("select");
         granular_option = document.createElement("option");
         additive_option = document.createElement("option");
+        spectral_option = document.createElement("option");
         exp_option = document.createElement("option");
         granular_option.innerHTML = "granular";
         additive_option.innerHTML = "additive";
+        spectral_option.innerHTML = "spectral";
         exp_option.innerHTML = "exp";
 
         chn_genv_type_label = document.createElement("label");
@@ -20759,6 +20762,7 @@ var _createFasSettingsContent = function () {
         chn_settings_div.innerHTML = "Chn " + (j + 1);
 
         chn_synthesis_select.appendChild(additive_option);
+        chn_synthesis_select.appendChild(spectral_option);
         chn_synthesis_select.appendChild(granular_option);
         chn_synthesis_select.appendChild(exp_option);
 
@@ -20770,8 +20774,10 @@ var _createFasSettingsContent = function () {
             if (chn_settings[0] === 0) {
                 additive_option.selected = true;
             } else if (chn_settings[0] === 1) {
-                granular_option.selected = true;
+                spectral_option.selected = true;
             } else if (chn_settings[0] === 2) {
+                granular_option.selected = true;
+            } else if (chn_settings[0] === 3) {
                 exp_option.selected = true;
             }
 
@@ -20786,10 +20792,12 @@ var _createFasSettingsContent = function () {
 
                 if (this.value === "additive") {
                     value = 0;
-                } else if (this.value === "granular") {
+                } else if (this.value === "spectral") {
                     value = 1;
-                } else if (this.value === "exp") {
+                } else if (this.value === "granular") {
                     value = 2;
+                } else if (this.value === "exp") {
+                    value = 3;
                 } else {
                     value = 0;
                 }

diff --git a/client/dist/fs.min.js b/client/dist/fs.min.js
diff --git a/client/js/ui.js b/client/js/ui.js
@@ -107,6 +107,7 @@ var _createFasSettingsContent = function () {
         chn_synthesis_select,
         granular_option,
         additive_option,
+        spectral_option,
         exp_option,
         chn_genv_type_label,
         chn_genv_type_select,
@@ -132,9 +133,11 @@ var _createFasSettingsContent = function () {
         chn_synthesis_select = document.createElement("select");
         granular_option = document.createElement("option");
         additive_option = document.createElement("option");
+        spectral_option = document.createElement("option");
         exp_option = document.createElement("option");
         granular_option.innerHTML = "granular";
         additive_option.innerHTML = "additive";
+        spectral_option.innerHTML = "spectral";
         exp_option.innerHTML = "exp";
 
         chn_genv_type_label = document.createElement("label");
@@ -170,6 +173,7 @@ var _createFasSettingsContent = function () {
         chn_settings_div.innerHTML = "Chn " + (j + 1);
 
         chn_synthesis_select.appendChild(additive_option);
+        chn_synthesis_select.appendChild(spectral_option);
         chn_synthesis_select.appendChild(granular_option);
         chn_synthesis_select.appendChild(exp_option);
 
@@ -181,8 +185,10 @@ var _createFasSettingsContent = function () {
             if (chn_settings[0] === 0) {
                 additive_option.selected = true;
             } else if (chn_settings[0] === 1) {
-                granular_option.selected = true;
+                spectral_option.selected = true;
             } else if (chn_settings[0] === 2) {
+                granular_option.selected = true;
+            } else if (chn_settings[0] === 3) {
                 exp_option.selected = true;
             }
 
@@ -197,10 +203,12 @@ var _createFasSettingsContent = function () {
 
                 if (this.value === "additive") {
                     value = 0;
-                } else if (this.value === "granular") {
+                } else if (this.value === "spectral") {
                     value = 1;
-                } else if (this.value === "exp") {
+                } else if (this.value === "granular") {
                     value = 2;
+                } else if (this.value === "exp") {
+                    value = 3;
                 } else {
                     value = 0;
                 }

diff --git a/osc_relay/osc_relay.js b/osc_relay/osc_relay.js
@@ -24,8 +24,6 @@ var udpPort = new osc.UDPPort({
     metadata: true
 });
 
-udpPort.open();
-
 function websocketConnect() {
     wss = new WebSocket.Server({
         server: server
@@ -63,7 +61,6 @@ udpPort.on("bundle", function (oscBundle, timeTag, info) {
 });
 
 udpPort.on("message", function (m) {
-    //console.log("message", m);
     if (websocketPort) {
         websocketPort.send(m);
     }
@@ -72,3 +69,5 @@ udpPort.on("message", function (m) {
 udpPort.on("error", function (e) {
     console.log("UDP Error: ", e);
 });
+
+udpPort.open();