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

Include wavpack/wavpack.h for WavpackContext #2416

Merged
merged 2 commits into from
Dec 30, 2019

Conversation

daschuer
Copy link
Member

Depending on the Wavpack version, WavpackContext is defined as "void" or "struct WavpackContext".
Clang build aborts with an error if that does not match which has happened here:
#2414

@daschuer
Copy link
Member Author

Still failing, but differently:

In file included from /Users/travis/build/mixxxdj/mixxx/src/sources/soundsourceproxy.cpp:31:
In file included from /Users/travis/build/mixxxdj/mixxx/src/sources/soundsourcewv.h:6:
/usr/local/include/wavpack/wavpack.h:46:3: error: typedef redefinition with different types ('struct ChunkHeader' vs 'struct ChunkHeader')
} ChunkHeader;
  ^
/Applications/Xcode-11.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk/System/Library/Frameworks/CoreServices.framework/Frameworks/CarbonCore.framework/Headers/AIFF.h:84:41: note: previous definition is here
typedef struct ChunkHeader              ChunkHeader;
                                        ^
In file included from /Users/travis/build/mixxxdj/mixxx/src/sources/soundsourceproxy.cpp:4:

@daschuer daschuer force-pushed the wavpack_clang branch 2 times, most recently from ee626b1 to a0444c0 Compare December 29, 2019 23:45
@uklotzde
Copy link
Contributor

uklotzde commented Dec 30, 2019

  • Use static_cast<WavpackContext*>(m_wpc) in .cpp file
  • Build failures Warnings for Qt 5.14 on macOS are unrelated (need to be fixed separately)

@uklotzde uklotzde added this to the 2.3.0 milestone Dec 30, 2019
@uklotzde
Copy link
Contributor

LGTM. Thanks for fixing this dependency issue!

@uklotzde uklotzde merged commit d3b0082 into mixxxdj:master Dec 30, 2019
@daschuer daschuer deleted the wavpack_clang branch September 26, 2021 17:41
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