Commit 3a62d449 authored by David Reid's avatar David Reid

Work on changes to the effect API.

parent 105d016e
...@@ -239,7 +239,7 @@ MA_API ma_result ma_engine_sound_set_position(ma_engine* pEngine, ma_sound* pSou ...@@ -239,7 +239,7 @@ MA_API ma_result ma_engine_sound_set_position(ma_engine* pEngine, ma_sound* pSou
MA_API ma_result ma_engine_sound_set_rotation(ma_engine* pEngine, ma_sound* pSound, ma_quat rotation); MA_API ma_result ma_engine_sound_set_rotation(ma_engine* pEngine, ma_sound* pSound, ma_quat rotation);
MA_API ma_result ma_engine_sound_set_looping(ma_engine* pEngine, ma_sound* pSound, ma_bool32 isLooping); MA_API ma_result ma_engine_sound_set_looping(ma_engine* pEngine, ma_sound* pSound, ma_bool32 isLooping);
MA_API ma_bool32 ma_engine_sound_at_end(ma_engine* pEngine, const ma_sound* pSound); MA_API ma_bool32 ma_engine_sound_at_end(ma_engine* pEngine, const ma_sound* pSound);
MA_API ma_result ma_engine_play_sound(ma_engine* pEngine, const char* pFilePath, ma_sound_group* pGroup); /* Fire and forget. Not yet implemented. */ MA_API ma_result ma_engine_play_sound(ma_engine* pEngine, const char* pFilePath, ma_sound_group* pGroup); /* Fire and forget. */
MA_API ma_result ma_engine_sound_group_init(ma_engine* pEngine, ma_sound_group* pParentGroup, ma_sound_group* pGroup); /* Parent must be set at initialization time and cannot be changed. Not thread-safe. */ MA_API ma_result ma_engine_sound_group_init(ma_engine* pEngine, ma_sound_group* pParentGroup, ma_sound_group* pGroup); /* Parent must be set at initialization time and cannot be changed. Not thread-safe. */
MA_API void ma_engine_sound_group_uninit(ma_engine* pEngine, ma_sound_group* pGroup); /* Not thread-safe. */ MA_API void ma_engine_sound_group_uninit(ma_engine* pEngine, ma_sound_group* pGroup); /* Not thread-safe. */
......
...@@ -76,8 +76,7 @@ int main(int argc, char** argv) ...@@ -76,8 +76,7 @@ int main(int argc, char** argv)
ma_uint64 inputFileDataSize2; ma_uint64 inputFileDataSize2;
const char* pInputFilePath1 = NULL; const char* pInputFilePath1 = NULL;
const char* pInputFilePath2 = NULL; const char* pInputFilePath2 = NULL;
ma_effect_config effectConfig; /*ma_effect_config effectConfig;*/
ma_effect effect;
if (argc > 1) { if (argc > 1) {
pInputFilePath1 = argv[1]; pInputFilePath1 = argv[1];
...@@ -98,6 +97,7 @@ int main(int argc, char** argv) ...@@ -98,6 +97,7 @@ int main(int argc, char** argv)
} }
#if 0
/* Effect. */ /* Effect. */
effectConfig = ma_effect_config_init(ma_effect_type_lpf, /*device.playback.format*/ ma_format_f32, device.playback.channels, device.sampleRate); effectConfig = ma_effect_config_init(ma_effect_type_lpf, /*device.playback.format*/ ma_format_f32, device.playback.channels, device.sampleRate);
effectConfig.lpf.cutoffFrequency = device.sampleRate / 16; effectConfig.lpf.cutoffFrequency = device.sampleRate / 16;
...@@ -106,6 +106,7 @@ int main(int argc, char** argv) ...@@ -106,6 +106,7 @@ int main(int argc, char** argv)
if (result != MA_SUCCESS) { if (result != MA_SUCCESS) {
return result; return result;
} }
#endif
/* Mixers. */ /* Mixers. */
...@@ -126,7 +127,10 @@ int main(int argc, char** argv) ...@@ -126,7 +127,10 @@ int main(int argc, char** argv)
} }
ma_mixer_set_volume(&g_mixerEffects, 1.0f); ma_mixer_set_volume(&g_mixerEffects, 1.0f);
#if 0
ma_mixer_set_effect(&g_mixerEffects, &effect); ma_mixer_set_effect(&g_mixerEffects, &effect);
#endif
......
This diff is collapsed.
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