Make resume idempotent (allowing you to call it twice without complaining.)

tannewt · tannewt · commit fc7c25af6dde · 2018-05-08T13:00:05.000-07:00
diff --git 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
@@ -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);

Original file line number	Diff line number	Diff line change
`@@ -236,10 +236,10 @@ STATIC mp_obj_t audiobusio_i2sout_obj_resume(mp_obj_t self_in) {`
`236`	`236`	`audiobusio_i2sout_obj_t *self = MP_OBJ_TO_PTR(self_in);`
`237`	`237`	`raise_error_if_deinited(common_hal_audiobusio_i2sout_deinited(self));`
`238`	`238`
`239`		`- if (!common_hal_audiobusio_i2sout_get_paused(self)) {`
`240`		`- mp_raise_RuntimeError("No paused sample");`
	`239`	`+ if (common_hal_audiobusio_i2sout_get_paused(self)) {`
	`240`	`+ common_hal_audiobusio_i2sout_resume(self);`
`241`	`241`	`}`
`242`		`- common_hal_audiobusio_i2sout_resume(self);`
	`242`	`+`
`243`	`243`	`return mp_const_none;`
`244`	`244`	`}`
`245`	`245`	`MP_DEFINE_CONST_FUN_OBJ_1(audiobusio_i2sout_resume_obj, audiobusio_i2sout_obj_resume);`
Original file line number	Diff line number	Diff line change
`@@ -233,10 +233,10 @@ STATIC mp_obj_t audioio_audioout_obj_resume(mp_obj_t self_in) {`
`233`	`233`	`audioio_audioout_obj_t *self = MP_OBJ_TO_PTR(self_in);`
`234`	`234`	`raise_error_if_deinited(common_hal_audioio_audioout_deinited(self));`
`235`	`235`
`236`		`- if (!common_hal_audioio_audioout_get_paused(self)) {`
`237`		`- mp_raise_RuntimeError("No paused sample");`
	`236`	`+ if (common_hal_audioio_audioout_get_paused(self)) {`
	`237`	`+ common_hal_audioio_audioout_resume(self);`
`238`	`238`	`}`
`239`		`- common_hal_audioio_audioout_resume(self);`
	`239`	`+`
`240`	`240`	`return mp_const_none;`
`241`	`241`	`}`
`242`	`242`	`MP_DEFINE_CONST_FUN_OBJ_1(audioio_audioout_resume_obj, audioio_audioout_obj_resume);`