Merge pull request #21 from dszakallas/reloop_andstop

implement reloop and stop
dszakallas · Mar 25, 2020 · e09b4ed · e09b4ed
2 parents 9ffbdaf + 579565a
commit e09b4ed
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/packages/app/src/App/controls/reloop.js b/packages/app/src/App/controls/reloop.js
@@ -13,7 +13,11 @@ export default (gridPosition: [number, number]) => (deck: ChannelControl) => (mo
         type: 'button',
         target: gridPosition,
         attack: () => {
-          modes(modifier.getState(), () => deck.reloop_exit.setValue(1))
+          modes(
+            modifier.getState(),
+            () => deck.reloop_exit.setValue(1),
+            () => deck.reloop_andstop.setValue(1)
+          )
         }
       },
       control: {

diff --git a/packages/mixxx/src/Control.js b/packages/mixxx/src/Control.js
@@ -113,6 +113,7 @@ export type SimpleChannelControlKey =
   | 'rate_temp_up'
   | 'rate_temp_up_small'
   | 'rateRange'
+  | 'reloop_andstop'
   | 'reloop_exit'
   | 'repeat'
   | 'reset_key'
@@ -246,6 +247,7 @@ const channelDef = (type: string, i: number) => ({
   rate_temp_up: { group: `[${type}${i}]`, name: 'rate_temp_up', type: 'binary' },
   rate_temp_up_small: { group: `[${type}${i}]`, name: 'rate_temp_up_small', type: 'binary' },
   rateRange: { group: `[${type}${i}]`, name: 'rateRange', type: '0.0..3.0' },
+  reloop_andstop: { group: `[${type}${i}]`, name: 'reloop_andstop', type: 'binary' },
   reloop_exit: { group: `[${type}${i}]`, name: 'reloop_exit', type: 'binary' },
   repeat: { group: `[${type}${i}]`, name: 'repeat', type: 'binary' },
   reset_key: { group: `[${type}${i}]`, name: 'reset_key', type: 'binary' },