Skip to content

Commit

Permalink
Sync Lock: rename a few more instances of sync_master to sync_leader
Browse files Browse the repository at this point in the history
  • Loading branch information
@ywwg
ywwg committed Jul 9, 2021
1 parent 9f374f4 commit 8559d2f
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 17 deletions.
16 changes: 8 additions & 8 deletions res/controllers/American Audio VMS4.midi.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<info>
<name>American Audio VMS4/4.1</name>
<author>Anders Gunnarsson &amp; Sean M. Pappalardo</author>
<description>2-deck control/4-deck mixer preset for Mixxx 2.1.
<description>2-deck control/4-deck mixer preset for Mixxx 2.1.
Assumes "Post EQ" mode. (See Wiki for full setup instructions.)</description>
<manual>american_audio_vms4</manual>
</info>
Expand Down Expand Up @@ -295,13 +295,13 @@ Assumes "Post EQ" mode. (See Wiki for full setup instructions.)</description>
</control>
<control><!-- Shifted Play -->
<group>[Channel1]</group>
<key>sync_master</key>
<key>sync_leader</key>
<status>0x91</status>
<midino>0x0D</midino>
</control>
<control><!-- Shifted Play -->
<group>[Channel1]</group>
<key>sync_master</key>
<key>sync_leader</key>
<status>0x81</status>
<midino>0x0D</midino>
</control>
Expand Down Expand Up @@ -1000,13 +1000,13 @@ Assumes "Post EQ" mode. (See Wiki for full setup instructions.)</description>
</control>
<control><!-- Shifted Play -->
<group>[Channel2]</group>
<key>sync_master</key>
<key>sync_leader</key>
<status>0x91</status>
<midino>0x2F</midino>
</control>
<control><!-- Shifted Play -->
<group>[Channel2]</group>
<key>sync_master</key>
<key>sync_leader</key>
<status>0x81</status>
<midino>0x2F</midino>
</control>
Expand Down Expand Up @@ -1615,7 +1615,7 @@ Assumes "Post EQ" mode. (See Wiki for full setup instructions.)</description>
<Spread64 />
</options>
</control>

<!-- Mixer channel 3 -->
<control>
<group>[Channel3]</group>
Expand Down Expand Up @@ -1671,7 +1671,7 @@ Assumes "Post EQ" mode. (See Wiki for full setup instructions.)</description>
<Spread64 />
</options>
</control>

<!-- Mixer channel 4 -->
<control>
<group>[Channel4]</group>
Expand Down Expand Up @@ -1727,7 +1727,7 @@ Assumes "Post EQ" mode. (See Wiki for full setup instructions.)</description>
<Spread64 />
</options>
</control>

<!-- Samplers -->
<!-- 1 -->
<control>
Expand Down
8 changes: 4 additions & 4 deletions res/controllers/Novation-Launchpad-scripts.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2202,9 +2202,9 @@ var NovationLaunchpad = (function () {
name: 'sync_enabled',
type: 'binary'
},
sync_master: {
sync_leader: {
group: "[".concat(type).concat(i, "]"),
name: 'sync_master',
name: 'sync_leader',
type: 'binary'
},
sync_mode: {
Expand Down Expand Up @@ -6765,9 +6765,9 @@ var NovationLaunchpad = (function () {
}
}, function () {
if (bindings.syncMode.getValue() === 2) {
deck.sync_master.setValue(0);
deck.sync_leader.setValue(0);
} else {
deck.sync_master.setValue(1);
deck.sync_leader.setValue(1);
}
});
}
Expand Down
4 changes: 2 additions & 2 deletions res/controllers/Roland_DJ-505-scripts.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -629,8 +629,8 @@ DJ505.Deck = function(deckNumbers, offset) {
// If already explicit leader, reset explicit state
// (setting it to 0 may still make it implicit leader and
// immediately resetting it to 1).
var value = (engine.getValue(this.group, "sync_master") === 2) ? 0 : 2;
engine.setValue(this.group, "sync_master", value);
var value = (engine.getValue(this.group, "sync_leader") === 2) ? 0 : 2;
engine.setValue(this.group, "sync_leader", value);
} else {
engine.setValue(this.group, "sync_enabled", 1);
}
Expand Down
6 changes: 3 additions & 3 deletions res/controllers/Traktor-Kontrol-S4-MK2-hid-scripts.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -380,7 +380,7 @@ TraktorS4MK2.registerOutputPackets = function() {

Output1.addOutput("[Master]", "!usblight", 0x2A, "B");
Output1.addOutput("[Master]", "!quantize", 0x31, "B");
Output1.addOutput("[InternalClock]", "sync_master", 0x30, "B");
Output1.addOutput("[InternalClock]", "sync_leader", 0x30, "B");
Output1.addOutput("[Recording]", "status", 0x34, "B");

this.controller.registerOutputPacket(Output1);
Expand Down Expand Up @@ -550,7 +550,7 @@ TraktorS4MK2.registerOutputPackets = function() {
TraktorS4MK2.linkChannelOutput("[EffectRack1_EffectUnit2_Effect3]", "enabled", TraktorS4MK2.outputChannelCallback);

TraktorS4MK2.linkChannelOutput("[PreviewDeck1]", "play_indicator", TraktorS4MK2.outputChannelCallback);
TraktorS4MK2.linkChannelOutput("[InternalClock]", "sync_master", TraktorS4MK2.outputChannelCallback);
TraktorS4MK2.linkChannelOutput("[InternalClock]", "sync_leader", TraktorS4MK2.outputChannelCallback);

if (TraktorS4MK2.RemixSlotButtonAction === "SAMPLES") {
TraktorS4MK2.linkChannelOutput("[Sampler1]", "play_indicator", TraktorS4MK2.outputChannelCallback);
Expand Down Expand Up @@ -723,7 +723,7 @@ TraktorS4MK2.init = function(id) {

TraktorS4MK2.controller.setOutput("[Master]", "!usblight", 0x7F, true);

TraktorS4MK2.outputChannelCallback(engine.getValue("[InternalClock]", "sync_master"), "[InternalClock]", "sync_master");
TraktorS4MK2.outputChannelCallback(engine.getValue("[InternalClock]", "sync_leader"), "[InternalClock]", "sync_leader");
TraktorS4MK2.outputChannelCallback(engine.getValue("[Recording]", "status"), "[Recording]", "status");
TraktorS4MK2.controller.setOutput("deck1", "!on_air", engine.getValue("[Recording]", "status")*0x7F);
TraktorS4MK2.controller.setOutput("deck2", "!on_air", engine.getValue("[Recording]", "status")*0x7F);
Expand Down

0 comments on commit 8559d2f

Please sign in to comment.