Skip to content

Commit 8fc1179

Browse files
committed
codal_port/modaudio: Organise file so module and AudioFrame are separate
1 parent a1bcf05 commit 8fc1179

File tree

1 file changed

+17
-15
lines changed

1 file changed

+17
-15
lines changed

src/codal_port/modaudio.c

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,23 @@ mp_obj_t is_playing(void) {
182182
}
183183
MP_DEFINE_CONST_FUN_OBJ_0(microbit_audio_is_playing_obj, is_playing);
184184

185+
STATIC const mp_rom_map_elem_t audio_globals_table[] = {
186+
{ MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_audio) },
187+
{ MP_ROM_QSTR(MP_QSTR_stop), MP_ROM_PTR(&microbit_audio_stop_obj) },
188+
{ MP_ROM_QSTR(MP_QSTR_play), MP_ROM_PTR(&microbit_audio_play_obj) },
189+
{ MP_ROM_QSTR(MP_QSTR_is_playing), MP_ROM_PTR(&microbit_audio_is_playing_obj) },
190+
{ MP_ROM_QSTR(MP_QSTR_AudioFrame), MP_ROM_PTR(&microbit_audio_frame_type) },
191+
};
192+
STATIC MP_DEFINE_CONST_DICT(audio_module_globals, audio_globals_table);
193+
194+
const mp_obj_module_t audio_module = {
195+
.base = { &mp_type_module },
196+
.globals = (mp_obj_dict_t *)&audio_module_globals,
197+
};
198+
199+
/******************************************************************************/
200+
// AudioFrame class
201+
185202
STATIC mp_obj_t microbit_audio_frame_new(const mp_obj_type_t *type_in, mp_uint_t n_args, mp_uint_t n_kw, const mp_obj_t *args) {
186203
(void)type_in;
187204
(void)args;
@@ -348,18 +365,3 @@ microbit_audio_frame_obj_t *microbit_audio_frame_make_new(void) {
348365
memset(res->data, 128, AUDIO_CHUNK_SIZE);
349366
return res;
350367
}
351-
352-
STATIC const mp_rom_map_elem_t audio_globals_table[] = {
353-
{ MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_audio) },
354-
{ MP_ROM_QSTR(MP_QSTR_stop), MP_ROM_PTR(&microbit_audio_stop_obj) },
355-
{ MP_ROM_QSTR(MP_QSTR_play), MP_ROM_PTR(&microbit_audio_play_obj) },
356-
{ MP_ROM_QSTR(MP_QSTR_is_playing), MP_ROM_PTR(&microbit_audio_is_playing_obj) },
357-
{ MP_ROM_QSTR(MP_QSTR_AudioFrame), MP_ROM_PTR(&microbit_audio_frame_type) },
358-
};
359-
360-
STATIC MP_DEFINE_CONST_DICT(audio_module_globals, audio_globals_table);
361-
362-
const mp_obj_module_t audio_module = {
363-
.base = { &mp_type_module },
364-
.globals = (mp_obj_dict_t *)&audio_module_globals,
365-
};

0 commit comments

Comments
 (0)