diff options
| author | Scott Shawcroft <scott.shawcroft@gmail.com> | 2018-05-08 13:00:05 -0700 |
|---|---|---|
| committer | Scott Shawcroft <scott.shawcroft@gmail.com> | 2018-05-08 13:00:05 -0700 |
| commit | fc7c25af6dde340fe67e36f9effcc09212734c69 (patch) | |
| tree | b8bffe1e19262a676c8489dcfb990ebe662ac741 | |
| parent | 24116eff231df034c3ffed0529a4790545ba5412 (diff) | |
Make resume idempotent (allowing you to call it twice without complaining.)
| -rw-r--r-- | shared-bindings/audiobusio/I2SOut.c | 6 | ||||
| -rw-r--r-- | shared-bindings/audioio/AudioOut.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/shared-bindings/audiobusio/I2SOut.c b/shared-bindings/audiobusio/I2SOut.c index e0271f697..4254c8ddb 100644 --- a/shared-bindings/audiobusio/I2SOut.c +++ b/shared-bindings/audiobusio/I2SOut.c @@ -236,10 +236,10 @@ STATIC mp_obj_t audiobusio_i2sout_obj_resume(mp_obj_t self_in) { audiobusio_i2sout_obj_t *self = MP_OBJ_TO_PTR(self_in); raise_error_if_deinited(common_hal_audiobusio_i2sout_deinited(self)); - if (!common_hal_audiobusio_i2sout_get_paused(self)) { - mp_raise_RuntimeError("No paused sample"); + if (common_hal_audiobusio_i2sout_get_paused(self)) { + common_hal_audiobusio_i2sout_resume(self); } - common_hal_audiobusio_i2sout_resume(self); + return mp_const_none; } MP_DEFINE_CONST_FUN_OBJ_1(audiobusio_i2sout_resume_obj, audiobusio_i2sout_obj_resume); diff --git a/shared-bindings/audioio/AudioOut.c b/shared-bindings/audioio/AudioOut.c index 6c91c5a4d..3450b3971 100644 --- a/shared-bindings/audioio/AudioOut.c +++ b/shared-bindings/audioio/AudioOut.c @@ -233,10 +233,10 @@ STATIC mp_obj_t audioio_audioout_obj_resume(mp_obj_t self_in) { audioio_audioout_obj_t *self = MP_OBJ_TO_PTR(self_in); raise_error_if_deinited(common_hal_audioio_audioout_deinited(self)); - if (!common_hal_audioio_audioout_get_paused(self)) { - mp_raise_RuntimeError("No paused sample"); + if (common_hal_audioio_audioout_get_paused(self)) { + common_hal_audioio_audioout_resume(self); } - common_hal_audioio_audioout_resume(self); + return mp_const_none; } MP_DEFINE_CONST_FUN_OBJ_1(audioio_audioout_resume_obj, audioio_audioout_obj_resume); |
