AuroraMiddleware/AuroraOpenALSoft
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Convert pshifter.c to C++

Browse Source
This commit is contained in:
Chris Robinson 2018-11-17 01:36:47 -08:00
parent f1731af282
commit 557048afa2
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Alc/effects/pshifter.c → Alc/effects/pshifter.cpp
View File

@ -51,9 +51,7 @@ typedef struct ALFrequencyDomain {
} ALfrequencyDomain;
typedef struct ALpshifterState {
DERIVE_FROM_TYPE(ALeffectState);
struct ALpshifterState final : public ALeffectState {
/* Effect parameters */
ALsizei count;
ALsizei PitchShiftI;
@ -77,7 +75,7 @@ typedef struct ALpshifterState {
/* Effect gains for each output channel */
ALfloat CurrentGains[MAX_OUTPUT_CHANNELS];
ALfloat TargetGains[MAX_OUTPUT_CHANNELS];
} ALpshifterState;
};
static ALvoid ALpshifterState_Destruct(ALpshifterState *state);
static ALboolean ALpshifterState_deviceUpdate(ALpshifterState *state, ALCdevice *device);
@ -161,6 +159,7 @@ static inline ALcomplex polar2rect(ALphasor number)
static void ALpshifterState_Construct(ALpshifterState *state)
{
new (state) ALpshifterState{};
ALeffectState_Construct(STATIC_CAST(ALeffectState, state));
SET_VTABLE2(ALpshifterState, ALeffectState, state);
@ -170,6 +169,7 @@ static void ALpshifterState_Construct(ALpshifterState *state)
static ALvoid ALpshifterState_Destruct(ALpshifterState *state)
{
ALeffectState_Destruct(STATIC_CAST(ALeffectState,state));
state->~ALpshifterState();
}
static ALboolean ALpshifterState_deviceUpdate(ALpshifterState *state, ALCdevice *device)
@ -347,9 +347,9 @@ static ALvoid ALpshifterState_process(ALpshifterState *state, ALsizei SamplesToD
maxi(SamplesToDo, 512), 0, SamplesToDo);
}
typedef struct PshifterStateFactory {
DERIVE_FROM_TYPE(EffectStateFactory);
} PshifterStateFactory;
struct PshifterStateFactory final : public EffectStateFactory {
PshifterStateFactory() noexcept;
};
static ALeffectState *PshifterStateFactory_create(PshifterStateFactory *UNUSED(factory))
{
@ -363,10 +363,15 @@ static ALeffectState *PshifterStateFactory_create(PshifterStateFactory *UNUSED(f
DEFINE_EFFECTSTATEFACTORY_VTABLE(PshifterStateFactory);
PshifterStateFactory::PshifterStateFactory() noexcept
: EffectStateFactory{GET_VTABLE2(PshifterStateFactory, EffectStateFactory)}
{
}
EffectStateFactory *PshifterStateFactory_getFactory(void)
{
static PshifterStateFactory PshifterFactory = { { GET_VTABLE2(PshifterStateFactory, EffectStateFactory) } };
static PshifterStateFactory PshifterFactory{};
return STATIC_CAST(EffectStateFactory, &PshifterFactory);
}

2
CMakeLists.txt
View File

@ -821,7 +821,7 @@ SET(ALC_OBJS
Alc/effects/fshifter.c
Alc/effects/modulator.c
Alc/effects/null.c
Alc/effects/pshifter.c
Alc/effects/pshifter.cpp
Alc/effects/reverb.cpp
Alc/filters/defs.h
Alc/filters/filter.c