Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

mapping for the Numark Mixtrack Pro FX #4160

Merged
merged 52 commits into from
Sep 4, 2021

Conversation

h67ma
Copy link
Contributor

@h67ma h67ma commented Jul 29, 2021

Hi,

I've created a mapping for Mixtrack Pro FX.

The mapping was discussed in this thread and received some good feedback. It was originally created by @bad1dea5 (see here), then modified by me, with some help from @photoenix and others.

Manual PR

@uklotzde
Copy link
Contributor

Thanks for contributing! Based on 2.3 and already accomplished by a PR for the manual, great 👍

As a First-time contributor we need to ask your to sign our CLA. No big deal, hopefully. Please comment here when done.

@h67ma
Copy link
Contributor Author

h67ma commented Jul 29, 2021

Can I use my nickname in the agreement? Or do I need to use real name?

@uklotzde
Copy link
Contributor

Can I use my nickname in the agreement? Or do I need to use real name?

Most of us have provided their real names. The list is not public and will not be published anywhere.

@daschuer Any advice?

@ronso0 ronso0 changed the title Mapping for the Mixtrack Pro FX mapping for the Numark Mixtrack Pro FX Jul 29, 2021
@ronso0
Copy link
Member

ronso0 commented Jul 29, 2021

well, the names is listed in the About box, so decide for yourself if you prefer a nick or you real name.

the actual purpose is to
a) mention all contributors
b) being able to get in contact with you, in case something license-related changes and we need further pernission or something (ev. App store etc.), so a valid email address is required

res/controllers/Numark-Mixtrack-Pro-FX-scripts.js Outdated Show resolved Hide resolved
res/controllers/Numark Mixtrack Pro FX.midi.xml Outdated Show resolved Hide resolved
@uklotzde uklotzde added this to the 2.3.1 milestone Jul 30, 2021
@h67ma
Copy link
Contributor Author

h67ma commented Jul 30, 2021

I've submitted the CLA (with nickname).

@Be-ing
Copy link
Contributor

Be-ing commented Jul 30, 2021

Can I use my nickname in the agreement? Or do I need to use real name?

I think it is most important that you provide an email address that you will respond to in the future if we ever need to contact past contributors.

@h67ma h67ma requested a review from uklotzde July 30, 2021 12:17
@Swiftb0y Swiftb0y self-assigned this Jul 30, 2021
Copy link
Member

@Swiftb0y Swiftb0y left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for submitting your mapping.
Please make sure to install pre-commit for both the mixxx and the manual repository and run it on the files you are submitting.

res/controllers/Numark Mixtrack Pro FX.midi.xml Outdated Show resolved Hide resolved
res/controllers/Numark Mixtrack Pro FX.midi.xml Outdated Show resolved Hide resolved
res/controllers/Numark-Mixtrack-Pro-FX-scripts.js Outdated Show resolved Hide resolved
res/controllers/Numark-Mixtrack-Pro-FX-scripts.js Outdated Show resolved Hide resolved
res/controllers/Numark-Mixtrack-Pro-FX-scripts.js Outdated Show resolved Hide resolved
res/controllers/Numark-Mixtrack-Pro-FX-scripts.js Outdated Show resolved Hide resolved
res/controllers/Numark-Mixtrack-Pro-FX-scripts.js Outdated Show resolved Hide resolved
res/controllers/Numark-Mixtrack-Pro-FX-scripts.js Outdated Show resolved Hide resolved
res/controllers/Numark-Mixtrack-Pro-FX-scripts.js Outdated Show resolved Hide resolved
res/controllers/Numark-Mixtrack-Pro-FX-scripts.js Outdated Show resolved Hide resolved
h67ma and others added 2 commits August 1, 2021 21:12
Co-authored-by: Swiftb0y <12380386+Swiftb0y@users.noreply.github.com>
Copy link
Member

@Swiftb0y Swiftb0y left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks. Last two comments. After that I'll have another look at the manual page and then thismapping is perfectly mergable (assuming no one else wants to have another look).

res/controllers/Numark-Mixtrack-Pro-FX-scripts.js Outdated Show resolved Hide resolved
res/controllers/Numark-Mixtrack-Pro-FX-scripts.js Outdated Show resolved Hide resolved
@h67ma
Copy link
Contributor Author

h67ma commented Aug 31, 2021

Is some action still required of me? Or is the code ready to be merged?

@Holzhaus
Copy link
Member

Holzhaus commented Aug 31, 2021

Is some action still required of me? Or is the code ready to be merged?

Don't worry, i think @Swiftb0y just needs to give his final approval and we need to proofread the manual changes (because we want to always merge both PRs at the same time).

Copy link
Member

@Swiftb0y Swiftb0y left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you, mapping looks very good.

@Holzhaus
Copy link
Member

Holzhaus commented Sep 1, 2021

@uklotzde I think you requested changes. Please hVe a look and let us know if you're okay with mergingt this.

Copy link
Contributor

@uklotzde uklotzde left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't remember that I requested changes 😅 Probably already resolved.

Let's merge the current version as is if everyone agrees as a baseline.

Did you read this new form post?
https://mixxx.discourse.group/t/numark-mixtrack-pro-fx/19561/57
I am unsure if it still applies or if this only affects a previous version.

@uklotzde
Copy link
Contributor

uklotzde commented Sep 3, 2021

This should be merged by someone who is also able to merge the corresponding manual PR.

@Be-ing
Copy link
Contributor

Be-ing commented Sep 4, 2021

This should be merged by someone who is also able to merge the corresponding manual PR.

@uklotzde do you not have write access to the manual repository?

@uklotzde
Copy link
Contributor

uklotzde commented Sep 4, 2021

This should be merged by someone who is also able to merge the corresponding manual PR.

@uklotzde do you not have write access to the manual repository?

No

@Be-ing Be-ing merged commit b128dff into mixxxdj:2.3 Sep 4, 2021
@Be-ing
Copy link
Contributor

Be-ing commented Sep 4, 2021

Thank you for working on this and following through with the code review comments! :) And thanks @Swiftb0y for doing the review.

@h67ma
Copy link
Contributor Author

h67ma commented Sep 4, 2021

Thanks for the in-depth review.

I will keep an eye on Mixxx updates and follow up with another PR when it will be possible to properly map FX selection.

@h67ma h67ma deleted the mapping_mixtrack_pro_fx branch September 4, 2021 17:49
@uklotzde
Copy link
Contributor

uklotzde commented Sep 5, 2021

@Be-ing Next time please stash the commits for controller mappings when merging to avoid flooding the Git history of the upstream repo.

@Be-ing
Copy link
Contributor

Be-ing commented Sep 5, 2021

Do you mean squash? I agree that would be appropriate but I have explicitly been told to not do that before.

@Holzhaus
Copy link
Member

Holzhaus commented Sep 5, 2021

IIRC we discussed somewhere that squash-and-merge for controller mappings is appropriate, squashing for C++ changes is not.

@uklotzde
Copy link
Contributor

uklotzde commented Sep 5, 2021

Of course "squash", not "stash" 🙈

@uklotzde
Copy link
Contributor

uklotzde commented Sep 5, 2021

+60 tiny commits for a single controller mapping is just too much.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
changelog This PR should be included in the changelog controller mappings
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants