diff --git a/src/audio/oal/oal_utils.cpp b/src/audio/oal/oal_utils.cpp index c69fab15..eabd5f14 100644 --- a/src/audio/oal/oal_utils.cpp +++ b/src/audio/oal/oal_utils.cpp @@ -3,7 +3,6 @@ #ifdef AUDIO_OAL -#ifndef __WIIU__ /* * When linking to a static openal-soft library, * the extension function inside the openal library conflict with the variables here. @@ -50,11 +49,9 @@ LPALGETFILTERFV alGetFilterfv; using namespace re3_openal; -#endif void EFXInit() { -#ifndef __WIIU__ /* Define a macro to help load the function pointers. */ /* Prefix all the function pointers with re* to avoid linking issue with the library functions */ #define LOAD_PROC(T, x) ((x) = (T)alGetProcAddress(#x)) @@ -94,7 +91,6 @@ LOAD_PROC(LPALGENEFFECTS, alGenEffects); LOAD_PROC(LPALGETAUXILIARYEFFECTSLOTF, alGetAuxiliaryEffectSlotf); LOAD_PROC(LPALGETAUXILIARYEFFECTSLOTFV, alGetAuxiliaryEffectSlotfv); #undef LOAD_PROC -#endif } void SetEffectsLevel(ALuint uiFilter, float level) diff --git a/src/audio/oal/oal_utils.h b/src/audio/oal/oal_utils.h index c6d3f070..f0fa090a 100644 --- a/src/audio/oal/oal_utils.h +++ b/src/audio/oal/oal_utils.h @@ -11,9 +11,7 @@ void EFX_Set(ALuint effect, const EAXLISTENERPROPERTIES *props); void EAX3_SetReverbMix(ALuint filter, float mix); void SetEffectsLevel(ALuint uiFilter, float level); -#ifndef __WIIU__ namespace re3_openal { -#endif extern LPALGENEFFECTS alGenEffects; extern LPALDELETEEFFECTS alDeleteEffects; @@ -49,10 +47,8 @@ extern LPALGETFILTERIV alGetFilteriv; extern LPALGETFILTERF alGetFilterf; extern LPALGETFILTERFV alGetFilterfv; -#ifndef __WIIU__ } using namespace re3_openal; -#endif #endif diff --git a/src/audio/sampman_oal.cpp b/src/audio/sampman_oal.cpp index b7253285..1c17b960 100644 --- a/src/audio/sampman_oal.cpp +++ b/src/audio/sampman_oal.cpp @@ -330,13 +330,11 @@ set_new_provider(int index) alDistanceModel(AL_INVERSE_DISTANCE_CLAMPED); -#ifndef __WIIU__ if ( alcIsExtensionPresent(ALDevice, (ALCchar*)ALC_EXT_EFX_NAME) ) { alGenAuxiliaryEffectSlots(1, &ALEffectSlot); alGenEffects(1, &ALEffect); } -#endif alGenSources(MAX_STREAMS*2, ALStreamSources[0]); for ( int32 i = 0; i < MAX_STREAMS; i++ ) @@ -358,7 +356,6 @@ set_new_provider(int index) usingEAX3 = 0; _usingEFX = false; -#ifndef __WIIU__ if ( !strcmp(&providers[index].name[strlen(providers[index].name) - strlen(" EAX3")], " EAX3") && alcIsExtensionPresent(ALDevice, (ALCchar*)ALC_EXT_EFX_NAME) ) { @@ -384,7 +381,6 @@ set_new_provider(int index) DEV("EFX\n"); } } -#endif //SampleManager.SetSpeakerConfig(speaker_type);