Use enums instead of defines for synth settings#296
Merged
Interrupt merged 2 commits intoInterrupt:masterfrom Mar 27, 2019
Merged
Use enums instead of defines for synth settings#296Interrupt merged 2 commits intoInterrupt:masterfrom
Interrupt merged 2 commits intoInterrupt:masterfrom
Conversation
Contributor
|
I like your enum solution better, although it's less consistent with the rest of the codebase. |
Contributor
Author
|
Yeah. |
Contributor
|
@oreo639 I see two errors: In file included from /Users/travis/build/Interrupt/systemshock/build_ext/fluidsynth-lite/src/utils/fluid_sys.c:24:
/Users/travis/build/Interrupt/systemshock/build_ext/fluidsynth-lite/src/utils/apple/timing_mach.h:22:6: error: macro expansion producing 'defined' has undefined behavior [-Werror,-Wexpansion-to-defined]
#if (TIMING_MACH_BEFORE_10_12)
^
/Users/travis/build/Interrupt/systemshock/build_ext/fluidsynth-lite/src/utils/apple/timing_mach.h:9:35: note: expanded from macro 'TIMING_MACH_BEFORE_10_12'
#define TIMING_MACH_BEFORE_10_12 (defined(__MACH__) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101200)
^
1 error generated....and... /Users/travis/build/Interrupt/systemshock/src/GameSrc/wrapper.c:373:14: error: use of undeclared identifier 'REF_STR_FluidSyn'
case REF_STR_FluidSyn: return "FluidSynth";
^ |
Contributor
Author
First one seems like it is unrelated to my pr. |
Owner
|
Looks like this has a merge conflict now, @oreo639 want to fix? |
Contributor
Author
|
Thanks for reminding me. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
I feel this is a cleaner way of doing it. If you disagree, let me know.