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

Update Numark-Mixtrack-3-scripts.js #13659

Closed
wants to merge 1 commit into from
Closed

Update Numark-Mixtrack-3-scripts.js #13659

wants to merge 1 commit into from

Conversation

amakea
Copy link

@amakea amakea commented Sep 17, 2024

Updates and bug fixes with gracious help by @Swiftb0y

Updates and bug fixes with gracious help by @Swiftb0y
@Swiftb0y
Copy link
Member

Welcome and thanks for improving this! Please sign the Mixxx Contributor Agreement and comment here when you have done so. It gives us permission to distribute your contribution under the GPL v2 or later license and the Apple Mac App Store. It is also helpful for us to have contact information for contributors in case we may need it in the future.

Since this is a bugfix, can you rebase this on the 2.4 branch as well? Thank you.

@amakea
Copy link
Author

amakea commented Sep 19, 2024

Is their a (fairly simple) way to rebase on the website? Or would it be easier to just do another fork and submit another pull request?

@Swiftb0y
Copy link
Member

not that I know of. I'll take care of it. ;)

Copy link

This PR is marked as stale because it has been open 90 days with no activity.

@github-actions github-actions bot added the stale Stale issues that haven't been updated for a long time. label Jan 13, 2025
@amakea
Copy link
Author

amakea commented Jan 16, 2025

Noticed some new activity regarding this controller. I signed the contributor agreement. Are you able to rebase it @Swiftb0y do I need to give you special permission?

@endcredits33
Copy link

endcredits33 commented Jan 16, 2025

Thanks @amakea and @Swiftb0y for these changes, working much better now.

I propose another change regarding the PFL LED behaviour and the smartPFL variable. Currently, loading a track changes the PFL LED status on the controller, which interferes with normal usage of PFL. For example, even if PFL is off on a deck, loading a track into it will make the PFL LED light up and vice versa, creating confusion.

I've proposed a fix in #14165. What's the best way of addressing this and merging with this PR?

@github-actions github-actions bot removed the stale Stale issues that haven't been updated for a long time. label Jan 17, 2025
@amakea
Copy link
Author

amakea commented Jan 17, 2025

Would be happy to see your changes included @endcredits33 . I'm a beginner with github as well. Apparently the PR needs to be rebased to a different version which I don't know how to do. Perhaps @ronso0 can assist with this?

@ronso0
Copy link
Member

ronso0 commented Jan 17, 2025

@endcredits33 you just need to create a branch based on this PR (branch: https://github.com/amakea/mixxx/tree/main, btw 'main' is not a good name, try to name branches to describe the feature / bug they adress).
Then commit your fix on top.
Push to your repo.
Share the commit hash.

For @amakea being able to git cherry-pick your commit locally, they need to add your fork to their local git remotes, then fetch it git fetch <remote name>.

@amakea amakea deleted the branch mixxxdj:main January 18, 2025 01:03
@amakea amakea closed this Jan 18, 2025
@amakea amakea deleted the main branch January 18, 2025 01:03
@amakea
Copy link
Author

amakea commented Jan 18, 2025

I changed the name of the branch and the pull request was closed and now I'm confused. I'm happy to just relinquish whatever "rights" I have to these code changes and hand them over to @Swiftb0y or @ronso0 because it would probably make things a lot simpler.

@ronso0
Copy link
Member

ronso0 commented Jan 18, 2025

I changed the name of the branch

Umm, just renamed it and the PR was closed instantly? You aren't working on the command line but with the Github web UI?
I didn't know that renaming the default branch of repo/fork (main in case of Mixxx) is even allowed. (ahh, you made mixtrack3 the default branch..)
I suggest learning to work with the git command line. A starter tutorial is on the wiki here and there are tons of tutorials on the web. Mixxx contributing page has instructions on how to get started.

For now, I suggest you create a new branch main from mixxxdj/mixxx/main and make that your default again.
image

Then open a PR from the mixtrack3 branch. Since no review happened here this is not a big loss.
Then @endcredits33 adds your repo to their remotes, creates a branch on top of your mixtrack3 branch and applies the fixup.
You can invite other Github users to your repo to collaborate. @endcredits33 can then push his branch to your repo.
And Mixxx maintainers can edit as well if you set the respective option (default on)
image

@amakea
Copy link
Author

amakea commented Jan 19, 2025

I think I did what you asked, and also invited endcredits33. Please let me know if I missed anything.
https://github.com/amakea/mixxx

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants