Skip to content

Commit 0f4821b

Browse files
committed
working with quneo
1 parent fe8ea01 commit 0f4821b

8 files changed

Lines changed: 203 additions & 98 deletions

File tree

defaultVJ.quneopreset

Lines changed: 1 addition & 0 deletions
Large diffs are not rendered by default.

public/library/.DS_Store

0 Bytes
Binary file not shown.

public/scripts/control.js

Lines changed: 36 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,56 @@
11

22
function onMIDIMessage(message) {
33
data = message.data;
4-
// console.log('MIDI data', data);
4+
console.log('MIDI data', data);
55

66
// Threshold for mixing - this show/hides screens
7-
if ( (data[0] === minim.cross[0]) && (data[1] === minim.cross[1]) ) {
7+
if ( (data[0] === quneo.mainSlider[0]) && (data[1] === quneo.mainSlider[1]) ) {
88
var bezierVal = data[2]/127;
99
threshold = ( easing(bezierVal) )*240
1010
// console.log('midi:'+data[2]+'bezier:'+bezierVal+'threshold:'+threshold);
1111
console.log(data[2],bezierVal,threshold);
1212
}
1313

14-
// if side buttons are pressed show set
15-
for (i=0; i<8; i++) {
16-
17-
if ( (data[0] === minim.side[i].onPress[0]) && data[1] === minim.side[i].onPress[1] ) {
18-
set = sets[i];
19-
console.log("set "+set.name);
20-
}
14+
// new control
15+
16+
// pad is pressed
17+
for (i=0; i<4; i++) {
18+
19+
// if pad is pressed
20+
if ( (data[0] === quneo.pads[i][data[1]].onPress[0]) && (data[1] === quneo.pads[i][data[1]].onPress[1]) ) {
21+
22+
set = sets[i];
23+
console.log("set "+set.name);
24+
var libraryName = '';
25+
var libraryItemNo = data[i];
26+
27+
if (data[1]>31) {
28+
29+
screenNo = 1;
30+
console.log("screen: "+screenNo);
31+
libraryItemNo = data[1]-32;
2132

22-
if ( (data[0] === minim.pads[i].onPress[0]) && data[1] === minim.pads[i].onPress[1] ) {
33+
} else {
34+
35+
screenNo = 0;
36+
console.log("screen: "+screenNo);
37+
38+
}
39+
40+
libraryName = set.tracks[libraryItemNo];
41+
42+
libraryTrack = library[libraryName];
43+
console.log('track: '+libraryTrack);
2344

2445
// load correct set stuff
25-
if (set.type === 'video') {
46+
if (libraryTrack.type === 'video') {
2647

27-
console.log(library);
28-
changeVidSrc(videoEls[screenNo], 'library/'+set.name+'/'+library.video[set.name][i]+'.mp4');
48+
changeVidSrc(videoEls[screenNo], 'library/'+libraryTrack.file);
2949

3050
showVideo(vidScreens[screenNo], domScreens[screenNo]);
3151

3252
//set.name
33-
} else if (set.type === 'dom') {
53+
} else if (libraryItem.type === 'dom') {
3454

3555
if (library.dom[set.name][i]) {
3656
var svg = d3.select(svgEls[screenNo]);
@@ -42,11 +62,12 @@ function onMIDIMessage(message) {
4262

4363
}
4464

45-
}
65+
}// if pad
4666

4767
}// for
4868

4969

70+
5071
// effects
5172

5273
// black

0 commit comments

Comments
 (0)