Skip to content

Commit 8d3a618

Browse files
cardinotcardinot
committed
Merge branch 'master' of https://github.com/mixxxdj/mixxx into coverArtSupport
2 parents 944d902 + 2acf167 commit 8d3a618

27 files changed

+449
-336
lines changed

‎res/controllers/Hercules DJ Console RMX 2.midi.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -1152,7 +1152,7 @@
11521152
<status>0xB0</status>
11531153
<midino>0x54</midino>
11541154
<options>
1155-
<hercjog/>
1155+
<hercjogfast/>
11561156
</options>
11571157
</control>
11581158
<control>
@@ -1161,7 +1161,7 @@
11611161
<status>0xB0</status>
11621162
<midino>0x55</midino>
11631163
<options>
1164-
<hercjog/>
1164+
<hercjogfast/>
11651165
</options>
11661166
</control>
11671167
<control>
@@ -1170,7 +1170,7 @@
11701170
<status>0xB0</status>
11711171
<midino>0x5C</midino>
11721172
<options>
1173-
<hercjog/>
1173+
<hercjogfast/>
11741174
</options>
11751175
</control>
11761176
<control>
@@ -1179,7 +1179,7 @@
11791179
<status>0xB0</status>
11801180
<midino>0x5D</midino>
11811181
<options>
1182-
<hercjog/>
1182+
<hercjogfast/>
11831183
</options>
11841184
</control>
11851185
<!-- Effects Controls [Effect Mode] -->

‎res/skins/LateNight-Stacked/channel.xml

-4
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
<Horizontal>false</Horizontal>
1515
<Connection>
1616
<ConfigKey>[ChannelX],volume</ConfigKey>
17-
<EmitOnDownPress>false</EmitOnDownPress>
1817
</Connection>
1918
</SliderComposed>
2019
<PushButton>
@@ -53,7 +52,6 @@
5352
<!--<Pos>4,54</Pos>-->
5453
<Connection>
5554
<ConfigKey>[ChannelX],filterHighKill</ConfigKey>
56-
<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
5755
<ButtonState>LeftButton</ButtonState>
5856
</Connection>
5957
</PushButton>
@@ -74,7 +72,6 @@
7472
<!--<Pos>4,93</Pos>-->
7573
<Connection>
7674
<ConfigKey>[ChannelX],filterMidKill</ConfigKey>
77-
<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
7875
<ButtonState>LeftButton</ButtonState>
7976
</Connection>
8077
</PushButton>
@@ -95,7 +92,6 @@
9592
<!--Pos>4,130</Pos>-->
9693
<Connection>
9794
<ConfigKey>[ChannelX],filterLowKill</ConfigKey>
98-
<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
9995
<ButtonState>LeftButton</ButtonState>
10096
</Connection>
10197
</PushButton>

‎res/skins/LateNight-Stacked/deck.xml

-12
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@
6161
<Horizontal>false</Horizontal>
6262
<Connection>
6363
<ConfigKey>[Channel<Variable name="channum" />],rate</ConfigKey>
64-
<EmitOnDownPress>false</EmitOnDownPress>
6564
</Connection>
6665
</SliderComposed>
6766
<WidgetGroup>
@@ -83,12 +82,10 @@
8382
</State>
8483
<Connection>
8584
<ConfigKey>[Channel<Variable name="channum" />],rate_perm_down</ConfigKey>
86-
<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
8785
<ButtonState>LeftButton</ButtonState>
8886
</Connection>
8987
<Connection>
9088
<ConfigKey>[Channel<Variable name="channum" />],rate_perm_down_small</ConfigKey>
91-
<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
9289
<ButtonState>RightButton</ButtonState>
9390
</Connection>
9491
</PushButton>
@@ -102,12 +99,10 @@
10299
</State>
103100
<Connection>
104101
<ConfigKey>[Channel<Variable name="channum" />],rate_perm_up</ConfigKey>
105-
<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
106102
<ButtonState>LeftButton</ButtonState>
107103
</Connection>
108104
<Connection>
109105
<ConfigKey>[Channel<Variable name="channum" />],rate_perm_up_small</ConfigKey>
110-
<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
111106
<ButtonState>RightButton</ButtonState>
112107
</Connection>
113108
</PushButton>
@@ -127,12 +122,10 @@
127122
</State>
128123
<Connection>
129124
<ConfigKey>[Channel<Variable name="channum" />],rate_temp_down</ConfigKey>
130-
<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
131125
<ButtonState>LeftButton</ButtonState>
132126
</Connection>
133127
<Connection>
134128
<ConfigKey>[Channel<Variable name="channum" />],rate_temp_down_small</ConfigKey>
135-
<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
136129
<ButtonState>RightButton</ButtonState>
137130
</Connection>
138131
</PushButton>
@@ -146,12 +139,10 @@
146139
</State>
147140
<Connection>
148141
<ConfigKey>[Channel<Variable name="channum" />],rate_temp_up</ConfigKey>
149-
<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
150142
<ButtonState>LeftButton</ButtonState>
151143
</Connection>
152144
<Connection>
153145
<ConfigKey>[Channel<Variable name="channum" />],rate_temp_up_small</ConfigKey>
154-
<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
155146
<ButtonState>RightButton</ButtonState>
156147
</Connection>
157148
</PushButton>
@@ -180,12 +171,10 @@
180171
</State>
181172
<Connection>
182173
<ConfigKey>[Channel<Variable name="channum" />],sync_enabled</ConfigKey>
183-
<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
184174
<ButtonState>LeftButton</ButtonState>
185175
</Connection>
186176
<Connection>
187177
<ConfigKey>[Channel<Variable name="channum" />],beatsync_tempo</ConfigKey>
188-
<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
189178
<ButtonState>RightButton</ButtonState>
190179
</Connection>
191180
</PushButton>
@@ -206,7 +195,6 @@
206195
</State>
207196
<Connection>
208197
<ConfigKey>[Channel<Variable name="channum" />],sync_master</ConfigKey>
209-
<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
210198
<ButtonState>LeftButton</ButtonState>
211199
</Connection>
212200
</PushButton> -->

0 commit comments

Comments
 (0)