Skip to content

Commit 5caaffe

Browse files
authored
Merge pull request mixxxdj#16657 from mixxxdj/ts-definitions-update-2.6
New Typescript definitions for COs on `2.6`
2 parents 669ab77 + df7fc34 commit 5caaffe

1 file changed

Lines changed: 66 additions & 14 deletions

File tree

res/controllers/mixxx-controls.d.ts

Lines changed: 66 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -626,7 +626,7 @@ declare namespace MixxxControls {
626626
| 'beat_closest'
627627

628628
/**
629-
* Outputs the relative position of the play marker in the section between the the previous and next beat marker.
629+
* Outputs the relative position of the play marker in the section between the previous and next beat marker.
630630
*
631631
* @groups [ChannelN], [PreviewDeckN], [SamplerN]
632632
* @range 0.0 - 1.0, real-valued
@@ -868,6 +868,66 @@ declare namespace MixxxControls {
868868
*/
869869
| 'beats_adjust_slower'
870870

871+
/**
872+
* Scale the BPM by 2.
873+
*
874+
* @groups [ChannelN], [PreviewDeckN], [SamplerN]
875+
* @range binary
876+
* @feedback BPM display, beatgrid
877+
* @since New in version 2.5.0.
878+
*/
879+
| 'beats_set_double'
880+
881+
/**
882+
* Scale the BPM by 4/3.
883+
*
884+
* @groups [ChannelN], [PreviewDeckN], [SamplerN]
885+
* @range binary
886+
* @feedback BPM display, beatgrid
887+
* @since New in version 2.5.0.
888+
*/
889+
| 'beats_set_fourthirds'
890+
891+
/**
892+
* Scale the BPM by 1/2.
893+
*
894+
* @groups [ChannelN], [PreviewDeckN], [SamplerN]
895+
* @range binary
896+
* @feedback BPM display, beatgrid
897+
* @since New in version 2.5.0.
898+
*/
899+
| 'beats_set_halve'
900+
901+
/**
902+
* Scale the BPM by 3/4.
903+
*
904+
* @groups [ChannelN], [PreviewDeckN], [SamplerN]
905+
* @range binary
906+
* @feedback BPM display, beatgrid
907+
* @since New in version 2.5.0.
908+
*/
909+
| 'beats_set_threefourths'
910+
911+
/**
912+
* Scale the BPM by 3/2.
913+
*
914+
* @groups [ChannelN], [PreviewDeckN], [SamplerN]
915+
* @range binary
916+
* @feedback BPM display, beatgrid
917+
* @since New in version 2.5.0.
918+
*/
919+
| 'beats_set_threehalves'
920+
921+
/**
922+
* Scale the BPM by 2/3.
923+
*
924+
* @groups [ChannelN], [PreviewDeckN], [SamplerN]
925+
* @range binary
926+
* @feedback BPM display, beatgrid
927+
* @since New in version 2.5.0.
928+
*/
929+
| 'beats_set_twothirds'
930+
871931
/**
872932
* Adjust beatgrid so closest beat is aligned with the current playposition.
873933
*
@@ -1470,7 +1530,7 @@ declare namespace MixxxControls {
14701530

14711531
/**
14721532
* Affects relative playback speed and direction for short instances (additive & is automatically reset to 0).
1473-
* Use this control to map controller jog wheel turns to pitch bend.
1533+
* Use it in controller mappings to do pitch-bend with jog wheels. See the example in the Mixxx Wiki -> Controller Scripting -> Scratching and jog wheels.
14741534
*
14751535
* @groups [ChannelN], [PreviewDeckN], [SamplerN]
14761536
* @range -3.0..3.0
@@ -2178,7 +2238,9 @@ declare namespace MixxxControls {
21782238
| 'reverseroll'
21792239

21802240
/**
2181-
* Affects absolute play speed & direction whether currently playing or not when [ChannelN],scratch2_enable is active. (multiplicative). Use JavaScript engine.scratch functions to manipulate in controller mappings.
2241+
* Affects absolute play speed & direction whether currently playing or not when [ChannelN],scratch2_enable is active. (multiplicative).
2242+
* Use JavaScript functions engine.scratchEnable, engine.scratchDisable, engine.isScratching and engine.isScratching to manipulate in controller mappings.
2243+
* See the example in the Mixxx Wiki -> Controller Scripting -> Scratching and jog wheels .
21822244
*
21832245
* @groups [ChannelN], [PreviewDeckN], [SamplerN]
21842246
* @range -3.0..3.0
@@ -4271,7 +4333,7 @@ declare namespace MixxxControls {
42714333
* @range binary
42724334
* @feedback Filter button
42734335
* @since New in version 2.0.0.
4274-
* @deprecated since version 2.0.0: Use [QuickEffectRack1_[ChannelN]_Effect1],enabled instead.
4336+
* @deprecated since version 2.0.0: Use [QuickEffectRack1_[ChannelN]],enabled instead.
42754337
*/
42764338
| 'filter'
42774339

@@ -4397,16 +4459,6 @@ declare namespace MixxxControls {
43974459
*/
43984460
| 'reloop_exit'
43994461

4400-
/**
4401-
* Affects playback speed and direction (differently whether currently playing or not) (multiplicative).
4402-
*
4403-
* @groups [ChannelN], [PreviewDeckN], [SamplerN]
4404-
* @range -3.0..3.0
4405-
* @feedback Waveform
4406-
* @deprecated since version ??: Use the JavaScript engine.scratch functions instead.
4407-
*/
4408-
| 'scratch'
4409-
44104462
/**
44114463
* Outputs the current instantaneous deck volume
44124464
*

0 commit comments

Comments
 (0)