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

[portmidi] Add overlay with iOS patches #128

Merged
merged 1 commit into from
Mar 3, 2024

Conversation

fwcd
Copy link
Member

@fwcd fwcd commented Feb 29, 2024

This vendors the portmidi port until PortMidi/portmidi#65 is merged. Note that this version of PortMidi is based on the latest master, which means we can also drop the other two patches.

@fwcd fwcd mentioned this pull request Feb 29, 2024
@fwcd fwcd marked this pull request as ready for review March 1, 2024 00:32
@fwcd fwcd mentioned this pull request Mar 1, 2024
54 tasks
@daschuer
Copy link
Member

daschuer commented Mar 3, 2024

It looks like this touched the code for iOS and macOS, which introduces a risk of a regression I am not able to estimate. The upstream PR is also still pending.

What would be the best strategy for 2.5?
One option is a fast merge for a high test rate. The other option is postponing this to 2.6 or/and making this an iOS only patch.

What do you think?

@fwcd
Copy link
Member Author

fwcd commented Mar 3, 2024

I'd consider it relatively safe to merge for 2.5. It does introduce a new abstraction, but the implementation for macOS stays exactly the same. Test-driving it during the beta phase would make sure nothing slipped through.

(Also a reason that the diff is so large is that it includes the migration to <stdint.h> types, i.e. uint64_t instead of UInt64. We've discussed that in the upstream review and since the PR introduces some new Apple-specific code, the decision was that it was easiest to include that change in the PR: PortMidi/portmidi#65 (comment))

@fwcd
Copy link
Member Author

fwcd commented Mar 3, 2024

Would be fine with 2.6 too though, it's your call

Copy link
Member

@daschuer daschuer left a comment

Choose a reason for hiding this comment

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

LGTM, OK than let's go for it.

@daschuer daschuer merged commit 556a389 into mixxxdj:2.5 Mar 3, 2024
3 checks passed
@fwcd fwcd deleted the mixxx/portmidi-ios branch March 3, 2024 20:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants