nodeskini 1.0.3 → 1.0.6

package/serveur/OSCandMidi.mjs

@@ -88,9 +88,10 @@ function startOSCandMIDI() {
         if (midiConfig[i].spec === "clipToDAW") {
           for (var j = 0; j < midiOutput.getPortCount(); ++j) {
             if (midiOutput.getPortName(j) === midiConfig[i].name) {
-              if (debug1) console.log("INFO: OSCandMIDI: getMidiPortForClipToDAW: Midi" +
-                midiConfig[i].type + ", usage:" + midiConfig[i].spec +
-                ", bus: " + midiOutput.getPortName(j) + ", " + midiConfig[i].comment);
+              if (debug1) console.log("INFO: OSCandMIDI: getMidiPortForClipToDAW:"
+                + " port number: " + j
+                + ", Midi" + midiConfig[i].type + ", usage:" + midiConfig[i].spec
+                + ", Bus: " + midiOutput.getPortName(j) + ", " + midiConfig[i].comment);
               return j;
             }
           }
@@ -118,7 +119,8 @@ function startOSCandMIDI() {
     }
 
     midiOutput.openPort(midiPortClipToDAW);
-    if (debug1) console.log("INFO: OSCandMidi.js: initMidiOUT: midiPortClipToDAW ", midiPortClipToDAW, midiOutput.getPortName(midiPortClipToDAW));
+    if (debug) console.log("INFO: OSCandMidi.js: initMidiOUT: port:", midiPortClipToDAW,
+      ", midiPortClipToDAW :", midiOutput.getPortName(midiPortClipToDAW));
   }
   _initMidiOUT = initMidiOUT;
 
@@ -137,7 +139,7 @@ function startOSCandMIDI() {
 export function sendProcessing(message, value) {
   var buf;
 
-  if (debug) console.log("OSCandMidi: sends osc to processing :" + message + " " + value + " to " + outportProcessing);
+  if (debug1) console.log("OSCandMidi: sends osc to processing :" + message + " " + value + " to " + outportProcessing);
   buf = osc.toBuffer({ address: message, args: [value] });
   return udp.send(buf, 0, buf.length, outportProcessing, remoteIPAddressImage);
 };

package/serveur/controleDAW.mjs

@@ -246,6 +246,7 @@ export function initBroadCastServer(serveur) {
  * @returns {number} - number of groups
  */
 export function getNbeDeGroupesSons() {
+  if(nbeDeGroupesSons < 0) return 0; // Protection
   return nbeDeGroupesSons;
 }
 
@@ -559,10 +560,10 @@ export function playAndShiftEventDAW(timerDivision) {
           if (debug) console.log("---2 controleDAW.mjs:sendNoteOn:", commandeDAW[CD_NOM_ID], " de durée: ", commandeDAW[CD_DUREE_ID], "avec timerDivisionLocal:", timerDivisionLocal);
 
           // Via OSC on perd les accents, donc on passe pas une WebSocket
-          if (debug) console.log("playAndShiftEventDAW: ", compteurTest, ": ", commandeDAW[CD_NOM_ID], ":", commandeDAW[CD_PSEUDO_ID]);
+          if (debug) console.log("controlDAW: playAndShiftEventDAW: ", compteurTest, ": ", commandeDAW[CD_NOM_ID], ":", commandeDAW[CD_PSEUDO_ID]);
 
           // Pour affichage avec un programme Processing
-          // oscMidi.sendProcessingDisplayNames( "demandeDeSonParPseudo", commandeDAW[7] );
+          //oscMidi.sendOSCProcessing( "demandeDeSonParPseudo", commandeDAW[TEXT_ID], commandeDAW[7] );
 
           // La ligne automatePossibleMachine.react(commandeDAW[8]) est activé selon reactOnPlay
           // Si reactOnPlay existe à true on envoie le signal, qui correspond au lancement d'un pattern, au moment de le jouer

package/serveur/defaultSkiniParametres.js

@@ -2,19 +2,22 @@
 
 // Default parameter file
 
-// Indexation des bus Midi dans OSCmidi de processing, pas utile avec Bitwig
+// Indexation des bus Midi pour OSCmidi
 // Il s'agit de l'index correspondant à l'élément du tableau midiConfig.json
 // qui crée le bus midi pour ces commandes.
-var midiConfig = require("../serveur/midiConfig.json");
-var countBusOUT = 0;
-for (var i = 0; i < midiConfig.length; i++) {
-  if (midiConfig[i].type === "OUT") {
-    if (midiConfig[i].spec === "clipToDAW") {
-      exports.busMidiDAW = countBusOUT;
-    }
-    countBusOUT++;
-  }
-}
+// var midiConfig = require("../serveur/midiConfig.json");
+// var countBusOUT = 0;
+// for (var i = 0; i < midiConfig.length; i++) {
+//   if (midiConfig[i].type === "OUT") {
+//     if (midiConfig[i].spec === "clipToDAW") {
+//       exports.busMidiDAW = countBusOUT;
+//     }
+//     countBusOUT++;
+//   }
+// }
+
+// A utiliser si Processing en passerelle
+exports.busMidiDAW = 1;
 
 // Piece Bitwig en OSC si la paramètre est false
 // Sinon Skini parle MIDI
@@ -31,7 +34,7 @@ exports.english = true;
   sont dans le simulateur qui sont utilisées
 ************************************/
 exports.tempoMax = 500; // En ms
-exports.tempoMin = 500; // En ms
+exports.tempoMin = 400; // En ms
 exports.limiteDureeAttente = 33; // En pulsations
 
 /********************************************************
@@ -112,8 +115,12 @@ const terre = '#A76611';
 const grisvert = '#039879';
 const grisbleu = '#315A93';
 
+// Pour group: nom du groupe (0), index du groupe (1), type (2), x(3), y(4),
+// nbe d'éléments(5), color(6), prédécesseurs(7), n° de scène graphique
 var groupesDesSons = [
-  // Pour group: nom du groupe (0), index du groupe (1), type (2), x(3), y(4), nbe d'éléments(5), color(6), prédécesseurs(7), n° de scène graphique
+  [ "toto",1, "group",100,100,3,"",[],1 ],
+  [ "titi",2, "group",200,200,3,"",[],1 ],
+  [ "tutu",2, "group",300,300,3,"",[],1 ],
 ];
 exports.groupesDesSons = groupesDesSons;
 

package/serveur/groupeClientsSons.mjs

@@ -91,7 +91,7 @@ function initGroupeClientsSons() {
   // Tableau des clients actifs par groupe,
   // Devient un tableau de tableau. Le premier tableau a des index correspondant au groupe.
   // Les tableaux en deuxième position contiennent les id des clients générés à la connexion.
-  if (debug1) console.log("groupeClientsSins.js: initGroupeClientsSons: par.nbeDeGroupesClients", par.nbeDeGroupesClients);
+  if (debug1) console.log("INFO: groupeClientsSons.mjs: initGroupeClientsSons: par.nbeDeGroupesClients", par.nbeDeGroupesClients);
   groupesClient = new Array(par.nbeDeGroupesClients);
   for (var i = 0; i < groupesClient.length; i++) {
     groupesClient[i] = new Array();
@@ -830,6 +830,13 @@ export function setMatriceDesPossibles() {
  * Clean the matrix.
  */
 export function resetMatriceDesPossibles() {
+  if(debug) console.log("WARN: groupeClientSons: resetMatriceDesPossibles:", matriceDesPossibles);
+
+  if(matriceDesPossibles[0] === undefined ) {
+    console.log("WARN: groupeClientSons: resetMatriceDesPossibles: matriceDesPossibles vide");
+    return;
+  }
+  
   for (var i = 0; i < matriceDesPossibles.length; i++) {
     for (var j = 0; j < matriceDesPossibles[i].length; j++) {
       matriceDesPossibles[i][j] = false;
@@ -879,16 +886,14 @@ export async function makeOneAutomatePossibleMachine() {
   try {
     const orchestration = await import(myReactOrchestration + '?foo=bar' + tempIndex);
     tempIndex++;
-    
-    orchestration.setServ(serv, DAW, this, oscMidiLocal, midimix);
-    
+    orchestration.setServ(serv, DAW, this, oscMidiLocal, midimix);   
     machine = orchestration.setSignals(par);
+
     makeSignalsListeners(machine);
     
     if (debug) console.log("------------- groupecliensSons: makeOneAutomatePossibleMachine:machine: ", machine);
     
     return machine;
-    
   } catch (err) {
     console.log("ERR: groupeClientsSons: makeOneAutomatePossibleMachine:", err.toString());
     throw err; // Propage l'erreur pour que compileHH() la capture

package/serveur/ipConfig.json

@@ -19,6 +19,6 @@
   "outportProcessing": 10000,
   "outportLumiere": 7700,
   "inportLumiere": 9000,
-  "sessionPath": "./pieces/",
-  "piecePath" : "./pieces/"
+  "sessionPath": "./pieces/opus/",
+  "piecePath" : "./pieces/opus/"
 }

package/serveur/midimix.mjs

@@ -102,7 +102,7 @@ export function midimix(machineServeur) {
   }
 
   if (synchroLink && !socketOpen) {
-    console.log("INFO: Synchro Ableton Link");
+    console.log("INFO: midimix.mjs :Synchro Ableton Link");
     const abletonlink = require('abletonlink');
     link = new abletonlink();
     let localBeat = 0;
@@ -116,7 +116,7 @@ export function midimix(machineServeur) {
       // On envoie un tick à chaque changement de beat.
       // Ce serait peut-être mieux d'utiliser la phase ?
       if (localBeat !== instantBeat) {
-        if (debug) console.log("midimix.js: Synchro Link ", Math.round(beat), Math.round(phase), Math.round(bpm));
+        if (debug) console.log("midimix.mjs: Synchro Link ", Math.round(beat), Math.round(phase), Math.round(bpm));
 
         // On a besoin de la phase pour synchroniser les départs.
         // On commence à envoyer des Tick après avoir reçu la phase 1.
@@ -124,7 +124,7 @@ export function midimix(machineServeur) {
         if(!linkReadyTostart){
           if(instantPhase === 100){
             linkReadyTostart = true;
-            if(debug1) console.log("INFO: midimix: link ready");
+            if(debug1) console.log("INFO: midimix.mjs: link ready");
           }
           return;
         }
@@ -144,7 +144,7 @@ export function midimix(machineServeur) {
   function setTempoLink(tempo) {
     if (link !== undefined) {
       link.bpm = tempo;
-      if(debug) console.log("INFO: midimix.js: setTempolink:", tempo);
+      if(debug) console.log("INFO: midimix.mjs: setTempolink:", tempo);
     }
   }
   _setTempoLink = setTempoLink;
@@ -233,7 +233,7 @@ export function midimix(machineServeur) {
       for (var i = 0; i < controlers.length; i++) {
         controlerIndex = getControlerIndex(controlers[i].name);
         if (controlerIndex === -1) {
-          console.log("WARN: controler :", controlers[i].name, " does not exist");
+          console.log("WARN: midimix.mjs : controler :", controlers[i].name, " does not exist");
           continue;
         }
         controlers[i].input.openPort(controlerIndex);
@@ -242,7 +242,7 @@ export function midimix(machineServeur) {
           controlers[i].input.getPortName(controlerIndex));
 
         controlers[i].input.on('message', function (deltaTime, message) {
-          if (debug1) console.log('midimix.js: Input received : ' + message + ' d:' + deltaTime);
+          if (debug1) console.log('midimix.mjs: Input received : ' + message + ' d:' + deltaTime);
 
           // Ici les actions sur commande MIDI
           // On ne distingue pas les controleurs.
@@ -329,7 +329,7 @@ export function midimix(machineServeur) {
       midiInput.on('message', function (deltaTime, message) {
         // On ne traite que les noteON, de 1001 0000 (144) à 1001 1111 (159)
         if (message[0] >= 144 && message[0] <= 159) {
-          if (debug) console.log('midimix.js: initMidiIN: Input recieved :' + message + ' d:' + deltaTime);
+          if (debug) console.log('midimix.mjs: initMidiIN: Input recieved :' + message + ' d:' + deltaTime);
           note = message[1];
           canal = message[0] - 144;
           //timeStamp = deltaTime; 
@@ -343,18 +343,18 @@ export function midimix(machineServeur) {
           // Le timestamp est proche de la micro-seconde.
           if (isInPreviousNotes(noteSkini) && Math.round(deltaTime) === 0) {
             //if (isInPreviousNotes(noteSkini) && previousTimeStamp === Math.round(timeStamp)){ // à peu près une seconde
-            if (debug) console.log("midimix.js: REPETITION : ", noteSkini, timeStamp, previousTimeStamp);
+            if (debug) console.log("midimix.mjs: REPETITION : ", noteSkini, timeStamp, previousTimeStamp);
           } else {
             //previousTimeStamp = Math.round(timeStamp); 
 
-            if (debug) console.log("midimix.js: noteSkini: ", noteSkini, note, canal);
-            if (debug) console.log("midimix.js: isInPreviousNotes:", isInPreviousNotes(noteSkini));
+            if (debug) console.log("midimix.mjs: noteSkini: ", noteSkini, note, canal);
+            if (debug) console.log("midimix.mjs: isInPreviousNotes:", isInPreviousNotes(noteSkini));
 
             // Avec PUSH branché, Ableton Live envoie des notes négatives...
             // dont je ne connais pas la signification
             if (noteSkini > 0) {
               insertInPreviousNotes(noteSkini);
-              if (debug) console.log("midimix.js: Note de pattern reçue d'Ableton:", noteSkini);
+              if (debug) console.log("midimix.mjs: Note de pattern reçue d'Ableton:", noteSkini);
               websocketServer.sendSignalFromDAW(noteSkini);
             }
           }
@@ -367,7 +367,7 @@ export function midimix(machineServeur) {
         tempoTickDuration++;
         if (message[0] === 248) {
           if (tempoTickDuration > 23) {
-            if (debug) console.log("midimix.js: midiSync.on:", Date.now() - v0, "ms");
+            if (debug) console.log("midimix.mjs: midiSync.on:", Date.now() - v0, "ms");
             //console.log('Sync recieved :' + message + ' d:' + deltaTime);
             if (debug) console.log("midimix 1 : Tick", message[0]);
             // Test pour éviter une "double synchro en OSC est en MIDI"
@@ -436,7 +436,7 @@ export function midimix(machineServeur) {
       //msgloc.value1 =  message.args[0].value; // C'est compliqué le parsing OSC
       //ws.send(JSON.stringify(msgloc));        // Pas utile pour le moment
       if (debug) {
-        console.log("midimix.js: socket reçoit OSC: [", message.address + " : " + message.args[0].value, "]");
+        console.log("midimix.mjs: socket reçoit OSC: [", message.address + " : " + message.args[0].value, "]");
       }
       switch (message.address) {
 

package/serveur/saveParam.mjs

@@ -30,17 +30,8 @@ export function saveParameters(paramFile, params) {
 // Generated by Skini: `+ today.toString() + `
 "use strict"
 
-var midiConfig = require("../serveur/midiConfig.json");
-
-var countBusOUT = 0;
-for (var i = 0; i < midiConfig.length; i++) {
-  if (midiConfig[i].type === "OUT") {
-    if (midiConfig[i].spec === "clipToDAW") {
-      exports.busMidiDAW = countBusOUT;
-    }
-    countBusOUT++;
-  }
-}
+// A utiliser si Processing en passerelle
+exports.busMidiDAW = 1;
 
 // Piece en OSC si la paramètre est false
 // Sinon Skini parle MIDI
@@ -148,12 +139,10 @@ exports.groupesDesSons = groupesDesSons;
   // On écrit en synchrone pour ne pas avoir de pb avec la compilation qui suit
   // dans websocketServer. On n'aurait pu mettre la compilation dans un callback
   // sans synchro. Ce serait plus joli, mais pas utile dans ce cas.
-
-  // Donne un message d'erreur alors que ça fonctionne !!!
   try {
     fs.writeFileSync(paramFile, paramText);
-    if(debug1) console.log("INFO: saveParam.js: saveParameters: file wrtitten :", paramFile);
+    if(debug) console.log("INFO: saveParam.js: saveParameters: file wrtitten :", paramFile, paramText);
   } catch (err) {
-    //console.log("ERR: saveParam.js: saveParameters: Pb ecriture", paramFile, err);
+    console.log("ERR: saveParam.js: saveParameters: Pb ecriture", paramFile, err);
   }
 }

package/serveur/skiniParametres.js

@@ -1,20 +1,11 @@
 
-// Generated by Skini: Mon Nov 24 2025 09:37:46 GMT+0100 (heure normale d’Europe centrale)
+// Generated by Skini: Wed Jan 07 2026 10:47:37 GMT+0100 (heure normale d’Europe centrale)
 "use strict"
 
-var midiConfig = require("../serveur/midiConfig.json");
+// A utiliser si Processing en passerelle
+exports.busMidiDAW = 1;
 
-var countBusOUT = 0;
-for (var i = 0; i < midiConfig.length; i++) {
-  if (midiConfig[i].type === "OUT") {
-    if (midiConfig[i].spec === "clipToDAW") {
-      exports.busMidiDAW = countBusOUT;
-    }
-    countBusOUT++;
-  }
-}
-
-// Piece Bitwig en OSC si la paramètre est false
+// Piece en OSC si la paramètre est false
 // Sinon Skini parle MIDI
 exports.directMidiON = true;
 
@@ -28,9 +19,9 @@ exports.english = true;
   Si ces valeurs ne sont pas données c'est celle qui
   sont dans le simulateur qui sont utilisées
 ************************************/
-exports.tempoMax = 500; // En ms
-exports.tempoMin = 500; // En ms
-exports.limiteDureeAttente = 33; // En pulsations
+exports.tempoMax = 2000; // En ms
+exports.tempoMin = 2200; // En ms
+exports.limiteDureeAttente = 2000; // En pulsations
 
 /********************************************************
 AUTOMATE
@@ -45,7 +36,7 @@ exports.pulsationON = false;
 CHEMIN DES FICHIERS SONS MP3 pour les clients
 Nom du sous répartoire ./sounds/xxxx
 *************************************/
-exports.soundFilesPath1 = "";
+exports.soundFilesPath1 = "opus4";
 
 /***************************************
 CHEMIN DES PARTITIONS DES PATTERNS ET CONFIG AVEC MUSICIENS
@@ -63,7 +54,7 @@ Si autre ... à créer...
 ATTENTION: NE JAMAIS UTILISER EN SITUATION D'INTERACTION SI L'ALGORITHME
 PEUT SUPPRIMER DES PATTERNS DES FIFOs
 *****************************************/
-exports.algoGestionFifo = 0;
+exports.algoGestionFifo = 2;
 exports.shufflePatterns = false;
 /*****************************************************************************
 
@@ -92,15 +83,106 @@ exports.synchroSkini = false;
 exports.timer = 500;
 exports.gameOSCSignals = false;
 
-exports.sensorOSC = false;
-exports.tempoSensorsInit = [0,0,0,0,0,0,0,0,,,,];
-exports.sensorsSensibilities = [0,0,0,0,0,0,0,0,,,,];
+exports.sensorOSC = true;
+exports.tempoSensorsInit = [100,100,100,100,100,100,20,20,20,20,20,20];
+exports.sensorsSensibilities = [200,200,200,200,200,200,200,200,200,200,200,199];
 
 const groupesDesSons = [
-  [ "toto",1, "group",100,100,3,"",[],1 ],
-  [ "titi",2, "group",200,200,3,"",[],1 ],
-  [ "tutu",2, "group",300,300,3,"",[],1 ],
-  [ "",, "",,,,"",[], ],
-  [ "",, "",,,,"",[], ],
+  [ "saxo",1, "group",401,200,21,"#4CAF50",[],10 ],
+  [ "nappeViolons",2, "group",100,500,20,"#4CAF50",[],1 ],
+  [ "nappe2Violons",3, "group",100,600,20,"#797bbf",[],1 ],
+  [ "Piano1Intro1",10, "tank",100,51,1,"#5F6262",[],1 ],
+  [ "Piano1Intro2",11, "tank",,,1,"#5F6262",[], ],
+  [ "Piano1Intro3",12, "tank",,,1,"#5F6262",[], ],
+  [ "Piano1Intro4",13, "tank",,,1,"#5F6262",[], ],
+  [ "Piano1Intro5",14, "tank",,,1,"#5F6262",[], ],
+  [ "Piano1Intro6",15, "tank",,,1,"#5F6262",[], ],
+  [ "Piano1Intro7",16, "tank",,,1,"#5F6262",[], ],
+  [ "Piano1Milieu1",17, "tank",,,1,"#5F6262",[], ],
+  [ "Piano1Milieu2",18, "tank",,,1,"#5F6262",[], ],
+  [ "Piano1Milieu3",19, "tank",,,1,"#5F6262",[], ],
+  [ "Piano1Milieu4",20, "tank",,,1,"#5F6262",[], ],
+  [ "Piano1Milieu5",21, "tank",,,1,"#5F6262",[], ],
+  [ "Piano1Milieu6",22, "tank",,,1,"#5F6262",[], ],
+  [ "Piano1Milieu7",23, "tank",,,1,"#5F6262",[], ],
+  [ "Piano1Fin1",24, "tank",,,1,"#5F6262",[], ],
+  [ "Piano1Fin2",25, "tank",,,1,"#5F6262",[], ],
+  [ "Piano1Fin3",26, "tank",,,1,"#5F6262",[], ],
+  [ "Piano1Fin4",27, "tank",,,1,"#5F6262",[], ],
+  [ "Piano1Fin5",28, "tank",,,1,"#5F6262",[], ],
+  [ "Piano1Fin6",29, "tank",,,1,"#5F6262",[], ],
+  [ "Piano1Fin7",30, "tank",,,1,"#5F6262",[], ],
+  [ "SaxIntro1",31, "tank",400,51,2,"#5F6262",[],1 ],
+  [ "SaxIntro2",32, "tank",,,2,"#5F6262",[], ],
+  [ "SaxIntro3",33, "tank",,,2,"#5F6262",[], ],
+  [ "SaxIntro4",34, "tank",,,2,"#5F6262",[], ],
+  [ "SaxIntro5",35, "tank",,,2,"#5F6262",[], ],
+  [ "SaxIntro6",36, "tank",,,2,"#5F6262",[], ],
+  [ "SaxIntro7",37, "tank",,,2,"#5F6262",[], ],
+  [ "SaxMilieu1",38, "tank",,,2,"#5F6262",[], ],
+  [ "SaxMilieu2",39, "tank",,,2,"#5F6262",[], ],
+  [ "SaxMilieu3",40, "tank",,,2,"#5F6262",[], ],
+  [ "SaxMilieu4",41, "tank",,,2,"#5F6262",[], ],
+  [ "SaxMilieu5",42, "tank",,,2,"#5F6262",[], ],
+  [ "SaxMilieu6",43, "tank",,,2,"#5F6262",[], ],
+  [ "SaxMilieu7",44, "tank",,,2,"#5F6262",[], ],
+  [ "SaxFin1",45, "tank",,,2,"#5F6262",[], ],
+  [ "SaxFin2",46, "tank",,,2,"#5F6262",[], ],
+  [ "SaxFin3",47, "tank",,,2,"#5F6262",[], ],
+  [ "SaxFin4",48, "tank",,,2,"#5F6262",[], ],
+  [ "SaxFin5",49, "tank",,,2,"#5F6262",[], ],
+  [ "SaxFin6",50, "tank",,,2,"#5F6262",[], ],
+  [ "SaxFin7",51, "tank",,,2,"#5F6262",[], ],
+  [ "BrassIntro1",52, "tank",700,51,3,"#039879",[],1 ],
+  [ "BrassIntro2",53, "tank",,,3,"#039879",[], ],
+  [ "BrassIntro3",54, "tank",,,3,"#039879",[], ],
+  [ "BrassIntro4",55, "tank",,,3,"#039879",[], ],
+  [ "BrassIntro5",56, "tank",,,3,"#039879",[], ],
+  [ "BrassIntro6",57, "tank",,,3,"#039879",[], ],
+  [ "BrassIntro7",58, "tank",,,3,"#039879",[], ],
+  [ "BrassMilieu1",59, "tank",,,3,"#039879",[], ],
+  [ "BrassMilieu2",60, "tank",,,3,"#039879",[], ],
+  [ "BrassMilieu3",61, "tank",,,3,"#039879",[], ],
+  [ "BrassMilieu4",62, "tank",,,3,"#039879",[], ],
+  [ "BrassMilieu5",63, "tank",,,3,"#039879",[], ],
+  [ "BrassMilieu6",64, "tank",,,3,"#039879",[], ],
+  [ "BrassMilieu7",65, "tank",,,3,"#039879",[], ],
+  [ "BrassFin1",66, "tank",,,3,"#039879",[], ],
+  [ "BrassFin2",67, "tank",,,3,"#039879",[], ],
+  [ "BrassFin3",68, "tank",,,3,"#039879",[], ],
+  [ "BrassFin4",69, "tank",,,3,"#039879",[], ],
+  [ "BrassFin5",70, "tank",,,3,"#039879",[], ],
+  [ "BrassFin6",71, "tank",,,3,"#039879",[], ],
+  [ "BrassFin7",72, "tank",,,3,"#039879",[], ],
+  [ "Percu1",73, "tank",800,600,4,"#039879",[],1 ],
+  [ "Percu2",74, "tank",,,4,"#039879",[], ],
+  [ "Percu3",75, "tank",,,4,"#039879",[], ],
+  [ "Percu4",76, "tank",,,4,"#039879",[], ],
+  [ "Percu5",77, "tank",,,4,"#039879",[], ],
+  [ "Percu6",78, "tank",,,4,"#039879",[], ],
+  [ "Percu7",79, "tank",,,4,"#039879",[], ],
+  [ "FluteIntro1",80, "tank",400,400,5,"#039879",[],1 ],
+  [ "FluteIntro2",81, "tank",,,5,"#039879",[], ],
+  [ "FluteIntro3",82, "tank",,,5,"#039879",[], ],
+  [ "FluteIntro4",83, "tank",,,5,"#039879",[], ],
+  [ "FluteIntro5",84, "tank",,,5,"#039879",[], ],
+  [ "FluteIntro6",85, "tank",,,5,"#039879",[], ],
+  [ "FluteIntro7",86, "tank",,,5,"#039879",[], ],
+  [ "FluteMilieu1",87, "tank",,,5,"#039879",[], ],
+  [ "FluteMilieu2",88, "tank",,,5,"#039879",[], ],
+  [ "FluteMilieu3",89, "tank",,,5,"#039879",[], ],
+  [ "FluteMilieu4",90, "tank",,,5,"#039879",[], ],
+  [ "FluteMilieu5",91, "tank",,,5,"#039879",[], ],
+  [ "FluteMilieu6",92, "tank",,,5,"#039879",[], ],
+  [ "FluteMilieu7",93, "tank",,,5,"#039879",[], ],
+  [ "FluteFin1",94, "tank",,,5,"#039879",[], ],
+  [ "FluteFin2",95, "tank",,,5,"#039879",[], ],
+  [ "FluteFin3",96, "tank",,,5,"#039879",[], ],
+  [ "FluteFin4",97, "tank",,,5,"#039879",[], ],
+  [ "FluteFin5",98, "tank",,,5,"#039879",[], ],
+  [ "FluteFin6",99, "tank",,,5,"#039879",[], ],
+  [ "FluteFin7",100, "tank",,,5,"#039879",[], ],
+  [ "Flesh",110, "group",100,350,7,"#008CBA",[],1 ],
+  [ "Massive",111, "group",100,400,7,"#008CBA",[],1 ],
   ];
 exports.groupesDesSons = groupesDesSons;

package/serveur/utilsHHSkini.hh.js

@@ -1,64 +1,64 @@
-/**
- * @fileOverview Utilitaires en hiphop.js pour Skini
- * 
- *  node ../node_modules/@hop/hiphop/bin/hhc.mjs utilsHHSkini.hh.js -o utilsHHSkini.mjs
- * 
- * @copyright (C) 2019-2025 Bertrand Petit-Hédelin
- * @author Bertrand Petit-Hédelin <bertrand@hedelin.fr>
- * @version 1.0
- */
-import { ReactiveMachine } from "@hop/hiphop";
-
-// Création réservoir ***********************************************************
-function makeAwait(instruments, groupeClient) {
-  return hiphop fork ${
-    instruments.map(val => hiphop {
-      await(this[`${val}IN`].now);
-      emit ${`${val}OUT`}([false, groupeClient]);
-     //host{ console.log("---------------------------- makeAwait", instruments, groupeClient)}
-  })}
-}
-
-function makeReservoir(groupeClient, instrument) {
-  return hiphop ${hiphop {
-      laTrappe: {
-        abort immediate(stopReservoir.now) { // To kill  the tank
-            host {
-              console.log("--- MAKE RESERVOIR:", instrument[0], ", groupeClient: ", groupeClient);
-              var msg = {
-                type: 'startTank',
-                value: instrument[0]
-              }
-              serveur.broadcast(JSON.stringify(msg)); // Pour les gestions des tanks dans l'affichage de la partition "score"
-            }
-            ${
-                instrument.map(val => hiphop {
-                emit ${`${val}OUT`} ([true, groupeClient])
-                })
-            }
-            host { gcs.informSelecteurOnMenuChange(groupeClient, instrument[0], true); }
-            ${ makeAwait(instrument, groupeClient) }
-            host { console.log("--- FIN NATURELLE RESERVOIR:", instrument[0]); }
-            break  laTrappe;
-        }
-
-        host { console.log("--- FIN FORCEE DU RESERVOIR:", instrument[0]); }
-        ${
-          instrument.map(val => hiphop {
-          emit ${`${val}OUT`} ([false, groupeClient])})
-        }
-
-        host { gcs.informSelecteurOnMenuChange(groupeClient, instrument[0], false); }
-        host {
-          console.log("--- ABORT RESERVOIR:", instrument[0]);
-          var msg = {
-            type: 'killTank',
-            value: instrument[0]
-          }
-          serveur.broadcast(JSON.stringify(msg)); // Pour les gestions des tanks dans l'affichage de la partition "score"
-        }
-      }
-    }
-  }
-}
-
+/**
+ * @fileOverview Utilitaires en hiphop.js pour Skini
+ *
+ *  node ../node_modules/@hop/hiphop/bin/hhc.mjs utilsHHSkini.hh.js -o utilsHHSkini.mjs
+ *
+ * @copyright (C) 2019-2025 Bertrand Petit-Hédelin
+ * @author Bertrand Petit-Hédelin <bertrand@hedelin.fr>
+ * @version 1.0
+ */
+import { ReactiveMachine } from "@hop/hiphop";
+
+// Création réservoir ***********************************************************
+function makeAwait(instruments, groupeClient) {
+  return hiphop fork ${
+    instruments.map(val => hiphop {
+      await(this[`${val}IN`].now);
+      emit ${`${val}OUT`}([false, groupeClient]);
+     //host{ console.log("---------------------------- makeAwait", instruments, groupeClient)}
+  })}
+}
+
+function makeReservoir(groupeClient, instrument) {
+  return hiphop ${hiphop {
+      laTrappe: {
+        abort immediate(stopReservoir.now) { // To kill  the tank
+            host {
+              console.log("--- MAKE RESERVOIR:", instrument[0], ", groupeClient: ", groupeClient);
+              var msg = {
+                type: 'startTank',
+                value: instrument[0]
+              }
+              serveur.broadcast(JSON.stringify(msg)); // Pour les gestions des tanks dans l'affichage de la partition "score"
+            }
+            ${
+                instrument.map(val => hiphop {
+                emit ${`${val}OUT`} ([true, groupeClient])
+                })
+            }
+            host { gcs.informSelecteurOnMenuChange(groupeClient, instrument[0], true); }
+            ${ makeAwait(instrument, groupeClient) }
+            host { console.log("--- FIN NATURELLE RESERVOIR:", instrument[0]); }
+            break  laTrappe;
+        }
+
+        host { console.log("--- FIN FORCEE DU RESERVOIR:", instrument[0]); }
+        ${
+          instrument.map(val => hiphop {
+          emit ${`${val}OUT`} ([false, groupeClient])})
+        }
+
+        host { gcs.informSelecteurOnMenuChange(groupeClient, instrument[0], false); }
+        host {
+          console.log("--- ABORT RESERVOIR:", instrument[0]);
+          var msg = {
+            type: 'killTank',
+            value: instrument[0]
+          }
+          serveur.broadcast(JSON.stringify(msg)); // Pour les gestions des tanks dans l'affichage de la partition "score"
+        }
+      }
+    }
+  }
+}
+