Merge pull request #39 from jamiefaye/dev

dont convert midi cc in Midian yet
jamiefaye · Sep 18, 2019 · ad47613 · ad47613
2 parents 0816c93 + 521d71f
commit ad47613
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/midian/src/MidiConversion.js b/midian/src/MidiConversion.js
@@ -238,11 +238,13 @@ class MidiConversion {
 	trout.midiChannel = chanNum;
 	trout.trackLength = clipMax;
 
+/* Until fixed someday:
 	// Control codes if present
 	let ccMap = track.controlChanges;
 	if (ccMap) {
 		this.convertTrackCCsToDeluge(trout, track, ccMap, (n)=>hexLZ32(Math.round(normTo32Fn(n.value))), context);
 	}
+*/
 
 	const bendList = track.channelEvents['pitchBend'];
 	if (bendList !== undefined && bendList.length > 0) {

diff --git a/xmlView/src/Arranger.jsx b/xmlView/src/Arranger.jsx
@@ -45,7 +45,7 @@ class Instrument extends React.Component {
 	let trackTab = getClipArray(song);
 	let arrangeOnlyTab = [];
 	if (song.arrangementOnlyTracks) {
-		arrangeOnlyTab = forceArray(song.arrangementOnlyTracks.track);
+		arrangeOnlyTab = forceArray(song.arrangementOnlyTracks);
 	}
 
 	let maxTrack = trackTab.length;

diff --git a/xmlView/src/keyOrderTab.js b/xmlView/src/keyOrderTab.js
@@ -435,6 +435,10 @@
 "lpf",
 "hpf",
 "equalizer"
+],
+"param": [
+"cc",
+"value"
 ]
 };
 
@@ -502,6 +506,7 @@ var heteroArrays = new Set();
 heteroArrays.add('instruments');
 heteroArrays.add('soundSources');
 heteroArrays.add('sessionClips');
+heteroArrays.add('arrangementOnlyTracks');
 
 var dontEncodeAsAttributes = new Set();
 dontEncodeAsAttributes.add("midiKnobs");