Skip to content

Commit 6d97f6f

Browse files
committed
audioio: Remove compatibility code
These items were aliased from audiocore to audioio for compatibility with 4.x, but according to our deprecation schedule can be removed in 6.0.
1 parent ce214e8 commit 6d97f6f

File tree

2 files changed

+0
-19
lines changed

2 files changed

+0
-19
lines changed

py/circuitpy_mpconfig.mk

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,6 @@ CFLAGS += -DCIRCUITPY_AUDIOBUSIO=$(CIRCUITPY_AUDIOBUSIO)
4545
CIRCUITPY_AUDIOIO ?= $(CIRCUITPY_FULL_BUILD)
4646
CFLAGS += -DCIRCUITPY_AUDIOIO=$(CIRCUITPY_AUDIOIO)
4747

48-
CIRCUITPY_AUDIOIO_COMPAT ?= $(CIRCUITPY_AUDIOIO)
49-
CFLAGS += -DCIRCUITPY_AUDIOIO_COMPAT=$(CIRCUITPY_AUDIOIO_COMPAT)
50-
5148
CIRCUITPY_AUDIOPWMIO ?= 0
5249
CFLAGS += -DCIRCUITPY_AUDIOPWMIO=$(CIRCUITPY_AUDIOPWMIO)
5350

shared-bindings/audioio/__init__.c

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,6 @@
3333
#include "shared-bindings/audioio/__init__.h"
3434
#include "shared-bindings/audioio/AudioOut.h"
3535

36-
#if CIRCUITPY_AUDIOIO_COMPAT
37-
#include "shared-bindings/audiomixer/Mixer.h"
38-
#include "shared-bindings/audiocore/RawSample.h"
39-
#include "shared-bindings/audiocore/WaveFile.h"
40-
#endif
41-
#if CIRCUITPY_AUDIOMIXER
42-
#include "shared-bindings/audiomixer/Mixer.h"
43-
#endif
44-
4536
//| """Support for audio output
4637
//|
4738
//| The `audioio` module contains classes to provide access to audio IO.
@@ -62,13 +53,6 @@
6253
STATIC const mp_rom_map_elem_t audioio_module_globals_table[] = {
6354
{ MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_audioio) },
6455
{ MP_ROM_QSTR(MP_QSTR_AudioOut), MP_ROM_PTR(&audioio_audioout_type) },
65-
#if CIRCUITPY_AUDIOIO_COMPAT
66-
#if CIRCUITPY_AUDIOMIXER
67-
{ MP_ROM_QSTR(MP_QSTR_Mixer), MP_ROM_PTR(&audiomixer_mixer_type) },
68-
#endif
69-
{ MP_ROM_QSTR(MP_QSTR_RawSample), MP_ROM_PTR(&audioio_rawsample_type) },
70-
{ MP_ROM_QSTR(MP_QSTR_WaveFile), MP_ROM_PTR(&audioio_wavefile_type) },
71-
#endif
7256
};
7357

7458
STATIC MP_DEFINE_CONST_DICT(audioio_module_globals, audioio_module_globals_table);

0 commit comments

Comments
 (0)