diff options
| author | sommersoft <sommersoft@gmail.com> | 2019-08-31 16:06:16 -0500 |
|---|---|---|
| committer | sommersoft <sommersoft@gmail.com> | 2019-08-31 16:06:16 -0500 |
| commit | f82c61732a25e1d8679ac2f8beb88d4fef506e2c (patch) | |
| tree | 11fd4b3b9a0e1bc247aefb329a15a67ed0655069 | |
| parent | e3ccd9756359ac29b4ca45ed7c98274d061b0770 (diff) | |
enable Mixer backwards compatibility (when audiomixer is available)
| -rw-r--r-- | shared-bindings/audiocore/__init__.c | 1 | ||||
| -rw-r--r-- | shared-bindings/audioio/__init__.c | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/shared-bindings/audiocore/__init__.c b/shared-bindings/audiocore/__init__.c index c9d5a1cab..cf05112cb 100644 --- a/shared-bindings/audiocore/__init__.c +++ b/shared-bindings/audiocore/__init__.c @@ -55,7 +55,6 @@ STATIC const mp_rom_map_elem_t audiocore_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_audiocore) }, - //{ MP_ROM_QSTR(MP_QSTR_Mixer), MP_ROM_PTR(&audioio_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) }, }; diff --git a/shared-bindings/audioio/__init__.c b/shared-bindings/audioio/__init__.c index ea81786d6..7fa37d5c5 100644 --- a/shared-bindings/audioio/__init__.c +++ b/shared-bindings/audioio/__init__.c @@ -74,8 +74,10 @@ 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(&audiomixer_mixer_type) }, +#if CIRCUITPY_AUDIOIO_COMPAT + #if CIRCUITPY_AUDIOMIXER + { MP_ROM_QSTR(MP_QSTR_Mixer), MP_ROM_PTR(&audiomixer_mixer_type) }, + #endif { 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 |