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

Fix RUBBERBANDV3 macro in rubberbandwrapper.cpp #14198

Merged
merged 1 commit into from
Jan 20, 2025
Merged

Conversation

Ge-lx
Copy link
Contributor

@Ge-lx Ge-lx commented Jan 19, 2025

Using rubberband v3 was erroring out for me at enginebufferscalerubberband.cpp:77, stalling the engine thread. The RUBBERBANDV3 macros differed between enginebufferscalerubberband.cpp and rubberbandwrapper.cpp

#14100 Only addressed enginebufferscalerubberband.cpp

@JoergAtGithub
Copy link
Member

Welcome at Mixxx!
As a first-time contributor we need you to 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.

@Ge-lx
Copy link
Contributor Author

Ge-lx commented Jan 19, 2025

Thanks,
I signed the Contributor Agreement

@JoergAtGithub JoergAtGithub changed the base branch from main to 2.5 January 20, 2025 00:33
@JoergAtGithub
Copy link
Member

This fix should go into the stable 2.5 branch. Could you please rebase your branch to 2.5. As described here: https://github.com/mixxxdj/mixxx/wiki/Using-Git#targeting-another-base-branch

@Ge-lx
Copy link
Contributor Author

Ge-lx commented Jan 20, 2025

This fix won't apply to 2.5 since this additional wrapping for RB was only introduced in 5e67d9d3eac8425c3678dac184512a4bc3a37e3a aka #13143

RB3 wasn't working for me in the release 2.5.0-1 (from arch extra repos), since the API version changed to 4.0 and #14100 was not included in that release. However the current 2.5 stable branch should work without issues.

This PR fixes #13143

@daschuer
Copy link
Member

Ah I see, the issue is fixed in the 2.5 branch:

#define RUBBERBANDV3 (RUBBERBAND_API_MAJOR_VERSION >= 3 || \

@daschuer daschuer changed the base branch from 2.5 to main January 20, 2025 10:20
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, Thank you.

@daschuer daschuer merged commit 675d427 into mixxxdj:main Jan 20, 2025
13 checks passed
@Swiftb0y Swiftb0y mentioned this pull request Feb 8, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants