Fix Kit Builder and other stuff

jamiefaye · Nov 7, 2022 · f758583 · f758583
1 parent f3bea5e
commit f758583
Show file tree

Hide file tree

Showing 7 changed files with 198 additions and 214 deletions.
diff --git a/midian/src/WaveThumb.jsx b/midian/src/WaveThumb.jsx
@@ -166,8 +166,19 @@ class WaveThumb extends React.Component {
 
 	if (this.osc) {
 		this.wave.initialZone = {};
-		this.wave.initialZone.startMilliseconds = Number(this.osc.zone.startMilliseconds);
-		this.wave.initialZone.endMilliseconds = Number(this.osc.zone.endMilliseconds);
+		let startMS;
+		let endMS;
+		if (this.osc.zone.hasOwnProperty("startMilliseconds"))
+		{
+			startMS = Number(this.wave.initialZone.startMilliseconds);
+			endMS = Number(this.osc.zone.endMilliseconds);
+		}
+		 else {
+			 startMS = Number(this.osc.zone.startSamplePos) / 44.1;
+			 endMS = Number(this.osc.zone.endSamplePos) / 44.1;
+		}
+		this.wave.initialZone.startMilliseconds = startMS;
+		this.wave.initialZone.endMilliseconds = endMS;
 	}
 	// console.log("aft openWaveSurfer");
   }
@@ -268,4 +279,4 @@ class TinyPlayer {
 };
 
 
-export {WaveThumb};
+export {WaveThumb};
diff --git a/xmlView/src/JsonXMLUtils.js b/xmlView/src/JsonXMLUtils.js
@@ -593,7 +593,5 @@ function jsonToXML3String(root, json) {
 	let depth = 0;
 	return jsonToXML3(root, json, depth);
 }
-
-
 export {getXmlDOMFromString, jsonequals, jsonToXMLString, xmlToJson, xml3ToJson, updateJSONfor4, reviveClass, 
 	jsonToXML3String, jsonToTable, forceArray, getClipArray, isArrayLike, nameToClassTab, classReplacer, zonkDNS};
diff --git a/xmlView/src/KitList.jsx b/xmlView/src/KitList.jsx
@@ -4,7 +4,7 @@ import Dropdown from 'react-dropdown';
 import {WaveView, SampleView} from './WaveView.jsx';
 import {openFileBrowser} from './FileBrowser.js';
 import {forceArray} from "./JsonXMLUtils.js";
-import {getXmlDOMFromString, xmlToJson, reviveClass} from './JsonXMLUtils.js';
+import {getXmlDOMFromString, xml3ToJson, reviveClass} from './JsonXMLUtils.js';
 import shortid from 'shortid';
 import {WedgeIndicator, IconPushButton, Icon2PushButton, PushButton, Checkbox, PlayerControl, CopyToClipButton, PasteTarget} from './GUIstuff.jsx';
 import {SortableContainer, SortableElement, SortableHandle, arrayMove} from 'react-sortable-hoc';
@@ -315,7 +315,7 @@ class KitList extends React.Component {
 	let temp3 = temp2.split('{{name}}');
 	let filledSoundT = temp3.join(suggestion);
 	let newDrumX = getXmlDOMFromString(filledSoundT);
-	let newSound = xmlToJson(newDrumX).sound;
+	let newSound = xml3ToJson(newDrumX).sound;
 	this.props.kitList.push(newSound);
 	this.forceUpdate();
   }

diff --git a/xmlView/src/SongViewLib.js b/xmlView/src/SongViewLib.js
@@ -772,7 +772,10 @@ upConvertSong()
 	  else if (jsonDoc['sound']) toMake = 'sound';
 	   else if (jsonDoc['kit']) toMake = 'kit';
 	if (!toMake) return;
- 	let saveText = headerStr + jsonToXML3String(toMake, this.jsonDocument[toMake]);
+	let makeDoc = jsonDoc[toMake];
+	makeDoc.firmwareVersion="4.0.1"
+	makeDoc.earliestCompatibleFirmware="4.0.0";
+ 	let saveText = headerStr + jsonToXML3String(toMake, makeDoc);
  	return saveText;
  }
 

diff --git a/xmlView/src/WaveView.jsx b/xmlView/src/WaveView.jsx
@@ -67,8 +67,19 @@ class WaveView extends React.Component {
 
 	if (this.osc) {
 		this.wave.initialZone = {};
-		this.wave.initialZone.startMilliseconds = Number(this.osc.zone.startMilliseconds);
-		this.wave.initialZone.endMilliseconds = Number(this.osc.zone.endMilliseconds);
+		let startMS;
+		let endMS;
+		if (this.osc.zone.startMilliseconds)
+		{
+			startMS = Number(this.wave.initialZone.startMilliseconds);
+			endMS = Number(this.osc.zone.endMilliseconds);
+		}
+		 else {
+			 startMS = Number(this.osc.zone.startSamplePos) / 44.1;
+			 endMS = Number(this.osc.zone.endSamplePos) / 44.1;
+		}
+		this.wave.initialZone.startMilliseconds = startMS;
+		this.wave.initialZone.endMilliseconds = endMS;
 	}
 	// console.log("aft openWaveSurfer");
   }
@@ -120,7 +131,7 @@ class WaveView extends React.Component {
 		let track = this.props.track;
 
 		if (this.osc && this.osc.zone) {
-			if (this.osc.zone.startMilliseconds) {
+			if (this.osc.zone.hasOwnProperty("startMilliseconds")) {
 				startT = Number(this.osc.zone.startMilliseconds) / 1000;
 				endT = Number(this.osc.zone.endMilliseconds) / 1000;
 			} else {

diff --git a/xmlView/src/keyOrderTab.js b/xmlView/src/keyOrderTab.js
@@ -1,5 +1,3 @@
-
-
 // Javascript does not specify a key-oder for enumerating properties of an object.
 // This means that element ordering may have been altered by edits, or the mere
 // act of going from XML to JSON. We fix this by consulting a table showing the
@@ -187,6 +185,7 @@
 "presetSubSlot",
 "trackInstances",
 "clipInstances",
+"defaultParams",
 "soundSources",
 "selectedDrumIndex",
 ],
@@ -291,9 +290,12 @@
 "stutterRate",
 "sampleRateReduction",
 "bitCrush",
-"equalizer",
 "modFXOffset",
 "modFXFeedback",
+"delay",
+"lpf",
+"hpf",
+"equalizer",
 ],
 "envelope1": ["attack",
 "decay",