From 696117b048bd39d9480cfa5a2ee0871942eba816 Mon Sep 17 00:00:00 2001 From: sommersoft Date: Sun, 25 Aug 2019 14:53:34 -0500 Subject: disable audiomixer on boards it doesn't fit on --- shared-module/audiocore/__init__.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'shared-module') diff --git a/shared-module/audiocore/__init__.c b/shared-module/audiocore/__init__.c index 8433a1770..f9762676f 100644 --- a/shared-module/audiocore/__init__.c +++ b/shared-module/audiocore/__init__.c @@ -42,9 +42,11 @@ uint32_t audiosample_sample_rate(mp_obj_t sample_obj) { } else if (MP_OBJ_IS_TYPE(sample_obj, &audioio_wavefile_type)) { audioio_wavefile_obj_t* file = MP_OBJ_TO_PTR(sample_obj); return file->sample_rate; + #if CIRCUITPY_AUDIOMIXER } else if (MP_OBJ_IS_TYPE(sample_obj, &audiomixer_mixer_type)) { audiomixer_mixer_obj_t* mixer = MP_OBJ_TO_PTR(sample_obj); return mixer->sample_rate; + #endif } return 16000; } @@ -56,9 +58,11 @@ uint8_t audiosample_bits_per_sample(mp_obj_t sample_obj) { } else if (MP_OBJ_IS_TYPE(sample_obj, &audioio_wavefile_type)) { audioio_wavefile_obj_t* file = MP_OBJ_TO_PTR(sample_obj); return file->bits_per_sample; + #if CIRCUITPY_AUDIOMIXER } else if (MP_OBJ_IS_TYPE(sample_obj, &audiomixer_mixer_type)) { audiomixer_mixer_obj_t* mixer = MP_OBJ_TO_PTR(sample_obj); return mixer->bits_per_sample; + #endif } return 8; } @@ -70,9 +74,11 @@ uint8_t audiosample_channel_count(mp_obj_t sample_obj) { } else if (MP_OBJ_IS_TYPE(sample_obj, &audioio_wavefile_type)) { audioio_wavefile_obj_t* file = MP_OBJ_TO_PTR(sample_obj); return file->channel_count; + #if CIRCUITPY_AUDIOMIXER } else if (MP_OBJ_IS_TYPE(sample_obj, &audiomixer_mixer_type)) { audiomixer_mixer_obj_t* mixer = MP_OBJ_TO_PTR(sample_obj); return mixer->channel_count; + #endif } return 1; } @@ -84,9 +90,11 @@ void audiosample_reset_buffer(mp_obj_t sample_obj, bool single_channel, uint8_t } else if (MP_OBJ_IS_TYPE(sample_obj, &audioio_wavefile_type)) { audioio_wavefile_obj_t* file = MP_OBJ_TO_PTR(sample_obj); audioio_wavefile_reset_buffer(file, single_channel, audio_channel); + #if CIRCUITPY_AUDIOMIXER } else if (MP_OBJ_IS_TYPE(sample_obj, &audiomixer_mixer_type)) { audiomixer_mixer_obj_t* file = MP_OBJ_TO_PTR(sample_obj); audiomixer_mixer_reset_buffer(file, single_channel, audio_channel); + #endif } } @@ -100,9 +108,11 @@ audioio_get_buffer_result_t audiosample_get_buffer(mp_obj_t sample_obj, } else if (MP_OBJ_IS_TYPE(sample_obj, &audioio_wavefile_type)) { audioio_wavefile_obj_t* file = MP_OBJ_TO_PTR(sample_obj); return audioio_wavefile_get_buffer(file, single_channel, channel, buffer, buffer_length); + #if CIRCUITPY_AUDIOMIXER } else if (MP_OBJ_IS_TYPE(sample_obj, &audiomixer_mixer_type)) { audiomixer_mixer_obj_t* file = MP_OBJ_TO_PTR(sample_obj); return audiomixer_mixer_get_buffer(file, single_channel, channel, buffer, buffer_length); + #endif } return GET_BUFFER_DONE; } @@ -118,9 +128,11 @@ void audiosample_get_buffer_structure(mp_obj_t sample_obj, bool single_channel, audioio_wavefile_obj_t* file = MP_OBJ_TO_PTR(sample_obj); audioio_wavefile_get_buffer_structure(file, single_channel, single_buffer, samples_signed, max_buffer_length, spacing); + #if CIRCUITPY_AUDIOMIXER } else if (MP_OBJ_IS_TYPE(sample_obj, &audiomixer_mixer_type)) { audiomixer_mixer_obj_t* file = MP_OBJ_TO_PTR(sample_obj); audiomixer_mixer_get_buffer_structure(file, single_channel, single_buffer, samples_signed, max_buffer_length, spacing); + #endif } } -- cgit v1.2.3