diff options
| author | sommersoft <sommersoft@gmail.com> | 2019-08-24 23:36:18 -0500 |
|---|---|---|
| committer | sommersoft <sommersoft@gmail.com> | 2019-08-24 23:36:18 -0500 |
| commit | df5568d993ad10bb6ef68fc0f01f8561f3a6c78d (patch) | |
| tree | b159b1273d698ea36fe28aefab7b0392baf159f7 /shared-bindings/audioio | |
| parent | b54fd961cb20333c1db0c84b7f61467681911554 (diff) | |
move Mixer & MixerVoice from 'audiocore' to 'audiomixer'
Diffstat (limited to 'shared-bindings/audioio')
| -rw-r--r-- | shared-bindings/audioio/__init__.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/shared-bindings/audioio/__init__.c b/shared-bindings/audioio/__init__.c index bd771dda2..0d307335f 100644 --- a/shared-bindings/audioio/__init__.c +++ b/shared-bindings/audioio/__init__.c @@ -34,10 +34,13 @@ #include "shared-bindings/audioio/AudioOut.h" #ifdef CIRCUITPY_AUDIOIO_COMPAT -#include "shared-bindings/audiocore/Mixer.h" +#include "shared-bindings/audiomixer/Mixer.h" #include "shared-bindings/audiocore/RawSample.h" #include "shared-bindings/audiocore/WaveFile.h" #endif +#ifdef CIRCUIPY_AUDIOMIXER +#include "shared-bindings/audiomixer/Mixer.h" +#endif //| :mod:`audioio` --- Support for audio input and output //| ====================================================== @@ -72,7 +75,7 @@ STATIC const mp_rom_map_elem_t audioio_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_audioio) }, { MP_ROM_QSTR(MP_QSTR_AudioOut), MP_ROM_PTR(&audioio_audioout_type) }, #ifdef CIRCUITPY_AUDIOIO_COMPAT - { MP_ROM_QSTR(MP_QSTR_Mixer), MP_ROM_PTR(&audioio_mixer_type) }, + //{ MP_ROM_QSTR(MP_QSTR_Mixer), MP_ROM_PTR(&audiomixer_mixer_type) }, { MP_ROM_QSTR(MP_QSTR_RawSample), MP_ROM_PTR(&audioio_rawsample_type) }, { MP_ROM_QSTR(MP_QSTR_WaveFile), MP_ROM_PTR(&audioio_wavefile_type) }, #endif |