summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsommersoft <sommersoft@gmail.com>2019-08-24 08:20:26 -0500
committersommersoft <sommersoft@gmail.com>2019-08-24 08:20:26 -0500
commitd02d474cac314840ea84e26153934354d031acca (patch)
tree4c3168af59c8e36cb983b944ed55d96020fb0dfa
parent93e557e1678c9d673867ebd8b09596e0fa7791bd (diff)
fix MixerVoice 'get_playing'
-rw-r--r--shared-bindings/audiocore/MixerVoice.c19
1 files changed, 8 insertions, 11 deletions
diff --git a/shared-bindings/audiocore/MixerVoice.c b/shared-bindings/audiocore/MixerVoice.c
index d402f7327..996db9721 100644
--- a/shared-bindings/audiocore/MixerVoice.c
+++ b/shared-bindings/audiocore/MixerVoice.c
@@ -141,19 +141,16 @@ const mp_obj_property_t audioio_mixervoice_level_obj = {
(mp_obj_t)&mp_const_none_obj},
};
-//TODO: @sommersoft - enable voice.playing tracking? will need an additional field
-// in the struct, with supporting logic. disabled documentation for now.
+//| .. attribute:: playing
+//|
+//| True when any voice is being output. (read-only)
+//|
-// .. attribute:: playing
-//
-// True when any voice is being output. (read-only)
-//
STATIC mp_obj_t audioio_mixervoice_obj_get_playing(mp_obj_t self_in) {
-#if 0
- audioio_mixer_obj_t *self = MP_OBJ_TO_PTR(self_in);
- return mp_obj_new_bool(common_hal_audioio_mixer_get_playing(self));
-#endif
- return mp_const_none;
+ audioio_mixervoice_obj_t *self = MP_OBJ_TO_PTR(self_in);
+
+ return mp_obj_new_bool(common_hal_audioio_mixervoice_get_playing(self));
+
}
MP_DEFINE_CONST_FUN_OBJ_1(audioio_mixervoice_get_playing_obj, audioio_mixervoice_obj_get_playing);