Skip to content

Commit

Permalink
Merge pull request #22 from dszakallas/beatgrid_tapping
Browse files Browse the repository at this point in the history
and bpm tap
  • Loading branch information
dszakallas committed Mar 25, 2020
2 parents e09b4ed + e9982a0 commit e41f170
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 3 deletions.
3 changes: 2 additions & 1 deletion README.MD
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ tap tempo for playback or beatgrid.

- **normal**: tapping adjusts song playback tempo. You should have correctly detected BPM and beatgrid.

- **ctrl**: ~~instead of altering the playback tempo, tapping adjusts the beatgrid.~~ Not implemented. *Why?*
- **ctrl**: instead of altering the playback tempo, tapping adjusts the beatgrid.
- **shift**: sets the gridlines so the nearest beat aligns to current play position
- **ctrl+shift**: second button: sets the gridlines so the nearest beat lines up with the other track's nearest beat

Expand Down Expand Up @@ -360,6 +360,7 @@ Works the same way as the LOOP button on the GUI, ie. it toggles the current loo
Controls

- **normal**: toggles loop on/off
- **ctrl**: activate loop, jump to its loop point and stop

Feedback

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@mixxx-launchpad/project",
"version": "2.2.6",
"version": "2.3.0",
"description": "Novation Launchpad mapping for Mixxx",
"homepage": "https://github.com/dszakallas/mixxx-launchpad",
"respository": "https://github.com/dszakallas/mixxx-launchpad.git",
Expand Down
4 changes: 3 additions & 1 deletion packages/app/src/App/controls/tap.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@ export default (gridPosition: [number, number]) => (deck: ChannelControl) => (mo
() => {
tempoBpm.tap()
},
undefined,
() => {
deck.bpm_tap.setValue(1)
},
() => {
deck.beats_translate_curpos.setValue(1)
},
Expand Down

0 comments on commit e41f170

Please sign in to comment.