Skip to content

Use enums instead of defines for synth settings#296

Merged
Interrupt merged 2 commits intoInterrupt:masterfrom
oreo639:use-enums
Mar 27, 2019
Merged

Use enums instead of defines for synth settings#296
Interrupt merged 2 commits intoInterrupt:masterfrom
oreo639:use-enums

Conversation

@oreo639
Copy link
Copy Markdown
Contributor

@oreo639 oreo639 commented Mar 16, 2019

I feel this is a cleaner way of doing it. If you disagree, let me know.

@HunterZ
Copy link
Copy Markdown
Contributor

HunterZ commented Mar 16, 2019

I like your enum solution better, although it's less consistent with the rest of the codebase.

@oreo639
Copy link
Copy Markdown
Contributor Author

oreo639 commented Mar 16, 2019

Yeah.
Also, what's with

make[1]: *** [CMakeFiles/systemshock.dir/rule] Error 2
make: *** [systemshock] Error 2

@HunterZ
Copy link
Copy Markdown
Contributor

HunterZ commented Mar 16, 2019

@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";
             ^

@oreo639
Copy link
Copy Markdown
Contributor Author

oreo639 commented Mar 16, 2019

I see two errors:

First one seems like it is unrelated to my pr.
Second one, you are right. My bad, I forgot to do that.

@Interrupt
Copy link
Copy Markdown
Owner

Looks like this has a merge conflict now, @oreo639 want to fix?

@oreo639
Copy link
Copy Markdown
Contributor Author

oreo639 commented Mar 26, 2019

Thanks for reminding me.

@Interrupt Interrupt merged commit 5487c19 into Interrupt:master Mar 27, 2019
@oreo639 oreo639 deleted the use-enums branch March 27, 2019 02:51
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.

3 participants