Skip to content

Script updates #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ferranlala merged 3 commits into from
Jan 7, 2019
Merged

Script updates #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9058f5f
Mixtrack Platinum: use Function.prototype.bind for QJSEngine
Be-ing Jan 7, 2019
718f971
Numark N4: use Function.prototype.bind for QJSEngine
Be-ing Jan 7, 2019
8bd4ad9
Pioneer DDJ-SB2: use Function.prototype.bind for QJSEngine
Be-ing Jan 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions res/controllers/Numark-Mixtrack-Platinum-scripts.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ MixtrackPlatinum.EffectUnit = function (unitNumbers) {
components.Pot.prototype.input.call(this, channel, control, value, status, group);
},
connect: function() {
this.focus_connection = engine.makeConnection(eu.group, "focused_effect", this.onFocusChange);
this.focus_connection = engine.makeConnection(eu.group, "focused_effect", this.onFocusChange.bind(this));
this.focus_connection.trigger();
},
disconnect: function() {
Expand Down Expand Up @@ -367,7 +367,7 @@ MixtrackPlatinum.EffectUnit = function (unitNumbers) {
},
connect: function() {
components.Button.prototype.connect.call(this);
this.fx_connection = engine.makeConnection(eu.group, "focused_effect", this.onFocusChange);
this.fx_connection = engine.makeConnection(eu.group, "focused_effect", this.onFocusChange.bind(this));
},
disconnect: function() {
components.Button.prototype.disconnect.call(this);
Expand Down Expand Up @@ -405,7 +405,7 @@ MixtrackPlatinum.EffectUnit = function (unitNumbers) {
button.send(button.off);
button.flash_state = true;
}
});
}.bind(this));
},
stopFlash: function() {
engine.stopTimer(this.flash_timer);
Expand All @@ -426,7 +426,7 @@ MixtrackPlatinum.EffectUnit = function (unitNumbers) {
engine.setValue(eu.group, "show_parameters", 1);
}
}
});
}.bind(this));
this.show_focus_connection.trigger();

this.touch_strip = new this.EffectUnitTouchStrip();
Expand Down Expand Up @@ -563,7 +563,7 @@ MixtrackPlatinum.Deck = function(number, midi_chan, effects_unit) {
type: components.Button.prototype.types.toggle,
connect: function() {
components.Button.prototype.connect.call(this);
this.connections[1] = engine.makeConnection(this.group, this.outKey, MixtrackPlatinum.pflToggle);
this.connections[1] = engine.makeConnection(this.group, this.outKey, MixtrackPlatinum.pflToggle.bind(this));
},
});

Expand Down
14 changes: 7 additions & 7 deletions res/controllers/Numark-N4-scripts.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ NumarkN4.init = function (id) {
}
// create xFader callbacks and trigger them to fill NumarkN4.storedCrossfaderParams
_.forEach(NumarkN4.scratchXFader, function (value,control) {
var connectionObject = engine.makeConnection("[Mixer Profile]", control, NumarkN4.CrossfaderChangeCallback);
var connectionObject = engine.makeConnection("[Mixer Profile]", control, NumarkN4.CrossfaderChangeCallback.bind(this));
connectionObject.trigger();
NumarkN4.crossfaderCallbackConnections.push(connectionObject);
});
Expand Down Expand Up @@ -231,7 +231,7 @@ NumarkN4.topContainer = function (channel) {
this.timer = engine.beginTimer(1000, function () {
theContainer.reconnectComponents();
this.timer = 0;
}, true);
}.bind(this), true);
},
shift: function () {
this.group=theContainer.group;
Expand Down Expand Up @@ -325,14 +325,14 @@ NumarkN4.MixerTemplate = function () {
_.forEach(NumarkN4.scratchXFader, function (value, control){
engine.setValue("[Mixer Profile]", control, value);
NumarkN4.crossfaderCallbackConnections.push(
engine.makeConnection("[Mixer Profile]", control, NumarkN4.CrossfaderChangeCallback)
engine.makeConnection("[Mixer Profile]", control, NumarkN4.CrossfaderChangeCallback.bind(this))
);
});
} else {
_.forEach(NumarkN4.storedCrossfaderParams, function (value, control) {
engine.setValue("[Mixer Profile]", control, value);
NumarkN4.crossfaderCallbackConnections.push(
engine.makeConnection("[Mixer Profile]", control, NumarkN4.CrossfaderChangeCallback)
engine.makeConnection("[Mixer Profile]", control, NumarkN4.CrossfaderChangeCallback.bind(this))
);
});
}
Expand Down Expand Up @@ -495,7 +495,7 @@ NumarkN4.Deck = function (channel) {
}
engine.beginTimer(100,function () {
this.flickerSafetyTimeout=true;
},true);
}.bind(this),true);
}
},
});
Expand Down Expand Up @@ -587,10 +587,10 @@ NumarkN4.Deck = function (channel) {
// spawned which conflicted with the old (still running) timers.
if (!this.previouslyLoaded) {
//timer is more efficent is this case than a callback because it would be called too often.
theDeck.blinkTimer=engine.beginTimer(NumarkN4.blinkInterval,theDeck.manageChannelIndicator);
theDeck.blinkTimer=engine.beginTimer(NumarkN4.blinkInterval,theDeck.manageChannelIndicator.bind(theDeck));
}
this.previouslyLoaded=value;
});
}.bind(this));
this.pitchBendMinus = new components.Button({
midi: [0x90+channel,0x18,0xB0+channel,0x3D],
key: "rate_temp_down",
Expand Down
2 changes: 1 addition & 1 deletion res/controllers/Pioneer-DDJ-SB2-scripts.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1189,5 +1189,5 @@ PioneerDDJSB2.EffectUnit = function (unitNumber) {
var effectGroup = '[EffectRack1_EffectUnit' + unitNumber + '_Effect' + value + ']';
engine.softTakeoverIgnoreNextValue(effectGroup, 'meta');
}
});
}.bind(this));
};