Merge pull request #1950 from esbrandt/2.2-keyboard

Update 2.2 keyboard mapping template

res/keyboard/cs_CZ.kbd.cfg

@@ -13,26 +13,30 @@ crossfader_down_small Shift+g
 [Microphone]
 talkover \
 
-[VinylControl]
-Toggle Ctrl+t
-
 [PreviewDeck1]
 LoadSelectedTrackAndPlay Alt+Return
 start_stop Return
 back Alt+Left
 fwd Alt+Right
 
+[QuickEffectRack1_[Channel1]_Effect1]
+enabled ř
+
+[QuickEffectRack1_[Channel2]_Effect1]
+enabled ž
+
 [Channel1]
 play d
 cue_set Shift+d
 cue_default f
 cue_gotoandstop Shift+f
 
-back a
-reverse Shift+a
-fwd s
+beatjump_backward a
+beatjump_1_backward Shift+a
+beatjump_forward s
+beatjump_1_forward Shift+s
 
-beatsync +
+sync_enabled +
 bpm_tap Shift+1
 
 rate_perm_down F1
@@ -46,7 +50,6 @@ rate_temp_up_small Shift+F4
 
 pfl t
 filterLowKill b
-flanger ř
 
 hotcue_1_activate y
 hotcue_2_activate x
@@ -61,12 +64,18 @@ LoadSelectedTrack Shift+Left
 eject Alt+Shift+Left
 
 loop_in ě
+loop_in_goto Shift+2
 loop_out š
-reloop_exit č
+loop_out_goto Shift+3
+reloop_toggle č
+reloop_andstop Shift+4
 
-beatloop_4_toggle q
+beatloop_activate q
+beatlooproll_activate Shift+q
 loop_halve w
+beatjump_forward Shift+w
 loop_double e
+beatjump_backward Shift+e
 
 passthrough Ctrl+j
 vinylcontrol_mode Ctrl+Shift+Z
@@ -78,11 +87,12 @@ cue_set Shift+l
 cue_default ů
 cue_gotoandstop Shift+"
 
-back j
-reverse Shift+j
-fwd k
+beatjump_backward j
+beatjump_1_backward Shift+j
+beatjump_forward k
+beatjump_1_forward Shift+k
 
-beatsync ž
+sync_enabled ž
 bpm_tap Shift+6
 
 rate_perm_down F5
@@ -96,7 +106,6 @@ rate_temp_up_small Shift+F8
 
 pfl z
 filterLowKill n
-flanger 0
 
 hotcue_1_activate m
 hotcue_2_activate ,
@@ -111,12 +120,18 @@ LoadSelectedTrack Shift+Right
 eject Alt+Shift+Right
 
 loop_in ý
+loop_in_goto Shift+7
 loop_out á
-reloop_exit í
+loop_out_goto Shift+8
+reloop_toggle í
+reloop_andstop Shift+9
 
-beatloop_4_toggle u
+beatloop_activate u
+beatlooproll_activate Shift+u
 loop_halve i
+beatjump_forward Shift+i
 loop_double o
+beatjump_backward Shift+o
 
 passthrough Ctrl+k
 vinylcontrol_mode Ctrl+Shift+U
@@ -128,15 +143,23 @@ FileMenu_LoadDeck2 Ctrl+Shift+O
 FileMenu_Quit Ctrl+q
 LibraryMenu_NewPlaylist Ctrl+n
 LibraryMenu_NewCrate Ctrl+Shift+N
-ViewMenu_ShowSamplers Ctrl+1
+ViewMenu_ShowSkinSettings Ctrl+1
 ViewMenu_ShowMicrophone Ctrl+2
 ViewMenu_ShowVinylControl Ctrl+3
 ViewMenu_ShowPreviewDeck Ctrl+4
 ViewMenu_ShowEffects Ctrl+5
 ViewMenu_ShowCoverArt Ctrl+6
 ViewMenu_MaximizeLibrary Space
 OptionsMenu_EnableLiveBroadcasting Ctrl+l
-OptionsMenu_EnableVinyl1 Ctrl+y
-OptionsMenu_EnableVinyl2 Ctrl+u
+OptionsMenu_EnableVinyl1 Ctrl+t
+OptionsMenu_EnableVinyl2 Ctrl+z
+OptionsMenu_EnableVinyl3 Ctrl+u
+OptionsMenu_EnableVinyl4 Ctrl+i
 OptionsMenu_RecordMix Ctrl+r
+// DEVELOPER MENU
 OptionsMenu_ReloadSkin Ctrl+Shift+R
+OptionsMenu_DeveloperTools Ctrl+Shift+T
+OptionsMenu_DeveloperStatsExperiment Ctrl+Shift+E
+OptionsMenu_DeveloperStatsBase Ctrl+Shift+B
+DeveloperMenu_EnableDebugger Ctrl+Shift+D
+OptionsMenu_EnableShortcuts Ctrl+\

res/keyboard/da_DK.kbd.cfg

@@ -13,26 +13,30 @@ crossfader_down_small Shift+g
 [Microphone]
 talkover <
 
-[VinylControl]
-Toggle Ctrl+t
-
 [PreviewDeck1]
 LoadSelectedTrackAndPlay Alt+Return
 start_stop Return
 back Alt+Left
 fwd Alt+Right
 
+[QuickEffectRack1_[Channel1]_Effect1]
+enabled 5
+
+[QuickEffectRack1_[Channel2]_Effect1]
+enabled 0
+
 [Channel1]
 play d
 cue_set Shift+d
 cue_default f
 cue_gotoandstop Shift+f
 
-back a
-reverse Shift+a
-fwd s
+beatjump_backward a
+beatjump_1_backward Shift+a
+beatjump_forward s
+beatjump_1_forward Shift+s
 
-beatsync 1
+sync_enabled 1
 bpm_tap Shift+!
 
 rate_perm_down F1
@@ -46,7 +50,6 @@ rate_temp_up_small Shift+F4
 
 pfl t
 filterLowKill b
-flanger 5
 
 hotcue_1_activate z
 hotcue_2_activate x
@@ -61,28 +64,35 @@ LoadSelectedTrack Shift+Left
 eject Alt+Shift+Left
 
 loop_in 2
+loop_in_goto Shift+@
 loop_out 3
-reloop_exit 4
+loop_out_goto Shift+#
+reloop_toggle 4
+reloop_andstop Shift+$
 
-beatloop_4_toggle q
+beatloop_activate q
+beatlooproll_activate Shift+q
 loop_halve w
+beatjump_forward Shift+w
 loop_double e
+beatjump_backward Shift+e
 
 passthrough Ctrl+j
 vinylcontrol_mode Ctrl+Shift+Y
 vinylcontrol_cueing Ctrl+Alt+Y
 
 [Channel2]
 play l
-cue_set Shift+!
+cue_set Shift+l
 cue_default æ
 cue_gotoandstop Shift+Æ
 
-back j
-reverse Shift+j
-fwd k
+beatjump_backward j
+beatjump_1_backward Shift+j
+beatjump_forward k
+beatjump_1_forward Shift+k
 
-beatsync 6
+sync_enabled 6
 bpm_tap Shift+&
 
 rate_perm_down F5
@@ -96,7 +106,6 @@ rate_temp_up_small Shift+F8
 
 pfl y
 filterLowKill n
-flanger 0
 
 hotcue_1_activate m
 hotcue_2_activate ,
@@ -111,12 +120,18 @@ LoadSelectedTrack Shift+Right
 eject Alt+Shift+Right
 
 loop_in 7
+loop_in_goto Shift+/
 loop_out 8
-reloop_exit 9
+loop_out_goto Shift+(
+reloop_toggle 9
+reloop_andstop Shift+)
 
-beatloop_4_toggle u
+beatloop_activate u
+beatlooproll_activate Shift+u
 loop_halve i
+beatjump_forward Shift+i
 loop_double o
+beatjump_backward Shift+o
 
 passthrough Ctrl+k
 vinylcontrol_mode Ctrl+Shift+U
@@ -128,15 +143,23 @@ FileMenu_LoadDeck2 Ctrl+Shift+O
 FileMenu_Quit Ctrl+q
 LibraryMenu_NewPlaylist Ctrl+n
 LibraryMenu_NewCrate Ctrl+Shift+N
-ViewMenu_ShowSamplers Ctrl+1
+ViewMenu_ShowSkinSettings Ctrl+1
 ViewMenu_ShowMicrophone Ctrl+2
 ViewMenu_ShowVinylControl Ctrl+3
 ViewMenu_ShowPreviewDeck Ctrl+4
 ViewMenu_ShowEffects Ctrl+5
 ViewMenu_ShowCoverArt Ctrl+6
 ViewMenu_MaximizeLibrary Space
 OptionsMenu_EnableLiveBroadcasting Ctrl+l
-OptionsMenu_EnableVinyl1 Ctrl+y
-OptionsMenu_EnableVinyl2 Ctrl+u
+OptionsMenu_EnableVinyl1 Ctrl+t
+OptionsMenu_EnableVinyl2 Ctrl+y
+OptionsMenu_EnableVinyl3 Ctrl+u
+OptionsMenu_EnableVinyl4 Ctrl+i
 OptionsMenu_RecordMix Ctrl+r
+// DEVELOPER MENU
 OptionsMenu_ReloadSkin Ctrl+Shift+R
+OptionsMenu_DeveloperTools Ctrl+Shift+T
+OptionsMenu_DeveloperStatsExperiment Ctrl+Shift+E
+OptionsMenu_DeveloperStatsBase Ctrl+Shift+B
+DeveloperMenu_EnableDebugger Ctrl+Shift+D
+OptionsMenu_EnableShortcuts Ctrl+<