Commit 0e8a19ee authored by David Reid's avatar David Reid

Decouple fader, spatializer and panner from ma_effect.

parent 56e0e624
...@@ -1472,7 +1472,6 @@ MA_API ma_panner_config ma_panner_config_init(ma_format format, ma_uint32 channe ...@@ -1472,7 +1472,6 @@ MA_API ma_panner_config ma_panner_config_init(ma_format format, ma_uint32 channe
typedef struct typedef struct
{ {
ma_effect_base effect;
ma_format format; ma_format format;
ma_uint32 channels; ma_uint32 channels;
ma_pan_mode mode; ma_pan_mode mode;
...@@ -1500,7 +1499,6 @@ MA_API ma_spatializer_config ma_spatializer_config_init(ma_uint32 channelsIn, ma ...@@ -1500,7 +1499,6 @@ MA_API ma_spatializer_config ma_spatializer_config_init(ma_uint32 channelsIn, ma
typedef struct typedef struct
{ {
ma_effect_base effect;
ma_uint32 channelsIn; ma_uint32 channelsIn;
ma_uint32 channelsOut; ma_uint32 channelsOut;
ma_vec3 position; ma_vec3 position;
...@@ -1525,7 +1523,6 @@ MA_API ma_fader_config ma_fader_config_init(ma_format format, ma_uint32 channels ...@@ -1525,7 +1523,6 @@ MA_API ma_fader_config ma_fader_config_init(ma_format format, ma_uint32 channels
typedef struct typedef struct
{ {
ma_effect_base effect;
ma_fader_config config; ma_fader_config config;
float volumeBeg; /* If volumeBeg and volumeEnd is equal to 1, no fading happens (ma_fader_process_pcm_frames() will run as a passthrough). */ float volumeBeg; /* If volumeBeg and volumeEnd is equal to 1, no fading happens (ma_fader_process_pcm_frames() will run as a passthrough). */
float volumeEnd; float volumeEnd;
...@@ -8254,12 +8251,6 @@ MA_API ma_result ma_panner_init(const ma_panner_config* pConfig, ma_panner* pPan ...@@ -8254,12 +8251,6 @@ MA_API ma_result ma_panner_init(const ma_panner_config* pConfig, ma_panner* pPan
return MA_INVALID_ARGS; return MA_INVALID_ARGS;
} }
pPanner->effect.onProcessPCMFrames = ma_panner_effect__on_process_pcm_frames;
pPanner->effect.onGetRequiredInputFrameCount = NULL;
pPanner->effect.onGetExpectedOutputFrameCount = NULL;
pPanner->effect.onGetInputDataFormat = ma_panner_effect__on_get_data_format; /* Same format for both input and output. */
pPanner->effect.onGetOutputDataFormat = ma_panner_effect__on_get_data_format;
pPanner->format = pConfig->format; pPanner->format = pConfig->format;
pPanner->channels = pConfig->channels; pPanner->channels = pConfig->channels;
pPanner->mode = pConfig->mode; pPanner->mode = pConfig->mode;
...@@ -8499,12 +8490,6 @@ MA_API ma_result ma_spatializer_init(const ma_spatializer_config* pConfig, ma_sp ...@@ -8499,12 +8490,6 @@ MA_API ma_result ma_spatializer_init(const ma_spatializer_config* pConfig, ma_sp
return MA_INVALID_ARGS; return MA_INVALID_ARGS;
} }
pSpatializer->effect.onProcessPCMFrames = ma_spatializer_effect__on_process_pcm_frames;
pSpatializer->effect.onGetRequiredInputFrameCount = NULL;
pSpatializer->effect.onGetExpectedOutputFrameCount = NULL;
pSpatializer->effect.onGetInputDataFormat = ma_spatializer_effect__on_get_data_format_in;
pSpatializer->effect.onGetOutputDataFormat = ma_spatializer_effect__on_get_data_format_out;
pSpatializer->channelsIn = pConfig->channelsIn; pSpatializer->channelsIn = pConfig->channelsIn;
pSpatializer->channelsOut = pConfig->channelsOut; pSpatializer->channelsOut = pConfig->channelsOut;
pSpatializer->position = pConfig->position; pSpatializer->position = pConfig->position;
...@@ -8608,12 +8593,6 @@ MA_API ma_result ma_fader_init(const ma_fader_config* pConfig, ma_fader* pFader) ...@@ -8608,12 +8593,6 @@ MA_API ma_result ma_fader_init(const ma_fader_config* pConfig, ma_fader* pFader)
return MA_INVALID_ARGS; return MA_INVALID_ARGS;
} }
pFader->effect.onProcessPCMFrames = ma_fader_effect__on_process_pcm_frames;
pFader->effect.onGetRequiredInputFrameCount = NULL;
pFader->effect.onGetExpectedOutputFrameCount = NULL;
pFader->effect.onGetInputDataFormat = ma_fader_effect__on_get_data_format;
pFader->effect.onGetOutputDataFormat = ma_fader_effect__on_get_data_format;
pFader->config = *pConfig; pFader->config = *pConfig;
pFader->volumeBeg = 1; pFader->volumeBeg = 1;
pFader->volumeEnd = 1; pFader->volumeEnd = 1;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment