Skip to content

Commit a35d9b4

Browse files
tannewttannewt
committed
Refactor deinit check to reduce code size.
1 parent 6db4f45 commit a35d9b4

File tree

30 files changed

+270
-138
lines changed

30 files changed

+270
-138
lines changed

‎shared-bindings/_pew/PewPew.c

+9-6
Original file line numberDiff line numberDiff line change
@@ -96,17 +96,19 @@ STATIC mp_obj_t pewpew_make_new(const mp_obj_type_t *type, size_t n_args,
9696
mp_raise_TypeError(translate("Row entry must be digitalio.DigitalInOut"));
9797
}
9898
digitalio_digitalinout_obj_t *pin = MP_OBJ_TO_PTR(rows[i]);
99-
raise_error_if_deinited(
100-
common_hal_digitalio_digitalinout_deinited(pin));
99+
if (common_hal_digitalio_digitalinout_deinited(pin)) {
100+
raise_deinited_error();
101+
}
101102
}
102103

103104
for (size_t i = 0; i < cols_size; ++i) {
104105
if (!MP_OBJ_IS_TYPE(cols[i], &digitalio_digitalinout_type)) {
105106
mp_raise_TypeError(translate("Column entry must be digitalio.DigitalInOut"));
106107
}
107108
digitalio_digitalinout_obj_t *pin = MP_OBJ_TO_PTR(cols[i]);
108-
raise_error_if_deinited(
109-
common_hal_digitalio_digitalinout_deinited(pin));
109+
if (common_hal_digitalio_digitalinout_deinited(pin)) {
110+
raise_deinited_error();
111+
}
110112
}
111113

112114
if (!MP_OBJ_IS_TYPE(args[ARG_buttons].u_obj,
@@ -115,8 +117,9 @@ STATIC mp_obj_t pewpew_make_new(const mp_obj_type_t *type, size_t n_args,
115117
}
116118
digitalio_digitalinout_obj_t *buttons = MP_OBJ_TO_PTR(
117119
args[ARG_buttons].u_obj);
118-
raise_error_if_deinited(
119-
common_hal_digitalio_digitalinout_deinited(buttons));
120+
if (common_hal_digitalio_digitalinout_deinited(buttons)) {
121+
raise_deinited_error();
122+
}
120123

121124
pew_obj_t *pew = MP_STATE_VM(pew_singleton);
122125
if (!pew) {

‎shared-bindings/analogio/AnalogIn.c

+7-2
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,11 @@ STATIC mp_obj_t analogio_analogin_deinit(mp_obj_t self_in) {
8686
}
8787
MP_DEFINE_CONST_FUN_OBJ_1(analogio_analogin_deinit_obj, analogio_analogin_deinit);
8888

89+
STATIC void check_for_deinit(analogio_analogin_obj_t *self) {
90+
if (common_hal_analogio_analogin_deinited(self)) {
91+
raise_deinited_error();
92+
}
93+
}
8994
//| .. method:: __enter__()
9095
//|
9196
//| No-op used by Context Managers.
@@ -113,7 +118,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(analogio_analogin___exit___obj, 4, 4,
113118
//|
114119
STATIC mp_obj_t analogio_analogin_obj_get_value(mp_obj_t self_in) {
115120
analogio_analogin_obj_t *self = MP_OBJ_TO_PTR(self_in);
116-
raise_error_if_deinited(common_hal_analogio_analogin_deinited(self));
121+
check_for_deinit(self);
117122
return MP_OBJ_NEW_SMALL_INT(common_hal_analogio_analogin_get_value(self));
118123
}
119124
MP_DEFINE_CONST_FUN_OBJ_1(analogio_analogin_get_value_obj, analogio_analogin_obj_get_value);
@@ -132,7 +137,7 @@ const mp_obj_property_t analogio_analogin_value_obj = {
132137
//|
133138
STATIC mp_obj_t analogio_analogin_obj_get_reference_voltage(mp_obj_t self_in) {
134139
analogio_analogin_obj_t *self = MP_OBJ_TO_PTR(self_in);
135-
raise_error_if_deinited(common_hal_analogio_analogin_deinited(self));
140+
check_for_deinit(self);
136141
return mp_obj_new_float(common_hal_analogio_analogin_get_reference_voltage(self));
137142
}
138143
MP_DEFINE_CONST_FUN_OBJ_1(analogio_analogin_get_reference_voltage_obj,

‎shared-bindings/analogio/AnalogOut.c

+3-1
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,9 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(analogio_analogout___exit___obj, 4, 4
112112
//| resolution, the value is 16-bit.
113113
STATIC mp_obj_t analogio_analogout_obj_set_value(mp_obj_t self_in, mp_obj_t value) {
114114
analogio_analogout_obj_t *self = MP_OBJ_TO_PTR(self_in);
115-
raise_error_if_deinited(common_hal_analogio_analogout_deinited(self));
115+
if (common_hal_analogio_analogout_deinited(self)) {
116+
raise_deinited_error();
117+
}
116118
uint32_t v = mp_obj_get_int(value);
117119
if (v >= (1 << 16)) {
118120
mp_raise_ValueError(translate("AnalogOut is only 16 bits. Value must be less than 65536."));

‎shared-bindings/audiobusio/I2SOut.c

+11-6
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,11 @@ STATIC mp_obj_t audiobusio_i2sout_deinit(mp_obj_t self_in) {
134134
}
135135
STATIC MP_DEFINE_CONST_FUN_OBJ_1(audiobusio_i2sout_deinit_obj, audiobusio_i2sout_deinit);
136136

137+
STATIC void check_for_deinit(audiobusio_i2sout_obj_t *self) {
138+
if (common_hal_audiobusio_i2sout_deinited(self)) {
139+
raise_deinited_error();
140+
}
141+
}
137142
//| .. method:: __enter__()
138143
//|
139144
//| No-op used by Context Managers.
@@ -169,7 +174,7 @@ STATIC mp_obj_t audiobusio_i2sout_obj_play(size_t n_args, const mp_obj_t *pos_ar
169174
{ MP_QSTR_loop, MP_ARG_BOOL | MP_ARG_KW_ONLY, {.u_bool = false} },
170175
};
171176
audiobusio_i2sout_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
172-
raise_error_if_deinited(common_hal_audiobusio_i2sout_deinited(self));
177+
check_for_deinit(self);
173178
mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
174179
mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
175180

@@ -186,7 +191,7 @@ MP_DEFINE_CONST_FUN_OBJ_KW(audiobusio_i2sout_play_obj, 1, audiobusio_i2sout_obj_
186191
//|
187192
STATIC mp_obj_t audiobusio_i2sout_obj_stop(mp_obj_t self_in) {
188193
audiobusio_i2sout_obj_t *self = MP_OBJ_TO_PTR(self_in);
189-
raise_error_if_deinited(common_hal_audiobusio_i2sout_deinited(self));
194+
check_for_deinit(self);
190195
common_hal_audiobusio_i2sout_stop(self);
191196
return mp_const_none;
192197
}
@@ -198,7 +203,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(audiobusio_i2sout_stop_obj, audiobusio_i2sout_obj_stop
198203
//|
199204
STATIC mp_obj_t audiobusio_i2sout_obj_get_playing(mp_obj_t self_in) {
200205
audiobusio_i2sout_obj_t *self = MP_OBJ_TO_PTR(self_in);
201-
raise_error_if_deinited(common_hal_audiobusio_i2sout_deinited(self));
206+
check_for_deinit(self);
202207
return mp_obj_new_bool(common_hal_audiobusio_i2sout_get_playing(self));
203208
}
204209
MP_DEFINE_CONST_FUN_OBJ_1(audiobusio_i2sout_get_playing_obj, audiobusio_i2sout_obj_get_playing);
@@ -216,7 +221,7 @@ const mp_obj_property_t audiobusio_i2sout_playing_obj = {
216221
//|
217222
STATIC mp_obj_t audiobusio_i2sout_obj_pause(mp_obj_t self_in) {
218223
audiobusio_i2sout_obj_t *self = MP_OBJ_TO_PTR(self_in);
219-
raise_error_if_deinited(common_hal_audiobusio_i2sout_deinited(self));
224+
check_for_deinit(self);
220225

221226
if (!common_hal_audiobusio_i2sout_get_playing(self)) {
222227
mp_raise_RuntimeError(translate("Not playing"));
@@ -232,7 +237,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(audiobusio_i2sout_pause_obj, audiobusio_i2sout_obj_pau
232237
//|
233238
STATIC mp_obj_t audiobusio_i2sout_obj_resume(mp_obj_t self_in) {
234239
audiobusio_i2sout_obj_t *self = MP_OBJ_TO_PTR(self_in);
235-
raise_error_if_deinited(common_hal_audiobusio_i2sout_deinited(self));
240+
check_for_deinit(self);
236241

237242
if (common_hal_audiobusio_i2sout_get_paused(self)) {
238243
common_hal_audiobusio_i2sout_resume(self);
@@ -248,7 +253,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(audiobusio_i2sout_resume_obj, audiobusio_i2sout_obj_re
248253
//|
249254
STATIC mp_obj_t audiobusio_i2sout_obj_get_paused(mp_obj_t self_in) {
250255
audiobusio_i2sout_obj_t *self = MP_OBJ_TO_PTR(self_in);
251-
raise_error_if_deinited(common_hal_audiobusio_i2sout_deinited(self));
256+
check_for_deinit(self);
252257
return mp_obj_new_bool(common_hal_audiobusio_i2sout_get_paused(self));
253258
}
254259
MP_DEFINE_CONST_FUN_OBJ_1(audiobusio_i2sout_get_paused_obj, audiobusio_i2sout_obj_get_paused);

‎shared-bindings/audiobusio/PDMIn.c

+7-2
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,11 @@ STATIC mp_obj_t audiobusio_pdmin_deinit(mp_obj_t self_in) {
156156
}
157157
STATIC MP_DEFINE_CONST_FUN_OBJ_1(audiobusio_pdmin_deinit_obj, audiobusio_pdmin_deinit);
158158

159+
STATIC void check_for_deinit(audiobusio_pdmin_obj_t *self) {
160+
if (common_hal_audiobusio_pdmin_deinited(self)) {
161+
raise_deinited_error();
162+
}
163+
}
159164
//| .. method:: __enter__()
160165
//|
161166
//| No-op used by Context Managers.
@@ -188,7 +193,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(audiobusio_pdmin___exit___obj, 4, 4,
188193
//|
189194
STATIC mp_obj_t audiobusio_pdmin_obj_record(mp_obj_t self_obj, mp_obj_t destination, mp_obj_t destination_length) {
190195
audiobusio_pdmin_obj_t *self = MP_OBJ_TO_PTR(self_obj);
191-
raise_error_if_deinited(common_hal_audiobusio_pdmin_deinited(self));
196+
check_for_deinit(self);
192197
if (!MP_OBJ_IS_SMALL_INT(destination_length) || MP_OBJ_SMALL_INT_VALUE(destination_length) < 0) {
193198
mp_raise_TypeError(translate("destination_length must be an int >= 0"));
194199
}
@@ -223,7 +228,7 @@ MP_DEFINE_CONST_FUN_OBJ_3(audiobusio_pdmin_record_obj, audiobusio_pdmin_obj_reco
223228
//|
224229
STATIC mp_obj_t audiobusio_pdmin_obj_get_sample_rate(mp_obj_t self_in) {
225230
audiobusio_pdmin_obj_t *self = MP_OBJ_TO_PTR(self_in);
226-
raise_error_if_deinited(common_hal_audiobusio_pdmin_deinited(self));
231+
check_for_deinit(self);
227232
return MP_OBJ_NEW_SMALL_INT(common_hal_audiobusio_pdmin_get_sample_rate(self));
228233
}
229234
MP_DEFINE_CONST_FUN_OBJ_1(audiobusio_pdmin_get_sample_rate_obj, audiobusio_pdmin_obj_get_sample_rate);

‎shared-bindings/audioio/AudioOut.c

+11-6
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,11 @@ STATIC mp_obj_t audioio_audioout_deinit(mp_obj_t self_in) {
133133
}
134134
STATIC MP_DEFINE_CONST_FUN_OBJ_1(audioio_audioout_deinit_obj, audioio_audioout_deinit);
135135

136+
STATIC void check_for_deinit(audioio_audioout_obj_t *self) {
137+
if (common_hal_audioio_audioout_deinited(self)) {
138+
raise_deinited_error();
139+
}
140+
}
136141
//| .. method:: __enter__()
137142
//|
138143
//| No-op used by Context Managers.
@@ -170,7 +175,7 @@ STATIC mp_obj_t audioio_audioout_obj_play(size_t n_args, const mp_obj_t *pos_arg
170175
{ MP_QSTR_loop, MP_ARG_BOOL | MP_ARG_KW_ONLY, {.u_bool = false} },
171176
};
172177
audioio_audioout_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
173-
raise_error_if_deinited(common_hal_audioio_audioout_deinited(self));
178+
check_for_deinit(self);
174179
mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
175180
mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
176181

@@ -187,7 +192,7 @@ MP_DEFINE_CONST_FUN_OBJ_KW(audioio_audioout_play_obj, 1, audioio_audioout_obj_pl
187192
//|
188193
STATIC mp_obj_t audioio_audioout_obj_stop(mp_obj_t self_in) {
189194
audioio_audioout_obj_t *self = MP_OBJ_TO_PTR(self_in);
190-
raise_error_if_deinited(common_hal_audioio_audioout_deinited(self));
195+
check_for_deinit(self);
191196
common_hal_audioio_audioout_stop(self);
192197
return mp_const_none;
193198
}
@@ -199,7 +204,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(audioio_audioout_stop_obj, audioio_audioout_obj_stop);
199204
//|
200205
STATIC mp_obj_t audioio_audioout_obj_get_playing(mp_obj_t self_in) {
201206
audioio_audioout_obj_t *self = MP_OBJ_TO_PTR(self_in);
202-
raise_error_if_deinited(common_hal_audioio_audioout_deinited(self));
207+
check_for_deinit(self);
203208
return mp_obj_new_bool(common_hal_audioio_audioout_get_playing(self));
204209
}
205210
MP_DEFINE_CONST_FUN_OBJ_1(audioio_audioout_get_playing_obj, audioio_audioout_obj_get_playing);
@@ -217,7 +222,7 @@ const mp_obj_property_t audioio_audioout_playing_obj = {
217222
//|
218223
STATIC mp_obj_t audioio_audioout_obj_pause(mp_obj_t self_in) {
219224
audioio_audioout_obj_t *self = MP_OBJ_TO_PTR(self_in);
220-
raise_error_if_deinited(common_hal_audioio_audioout_deinited(self));
225+
check_for_deinit(self);
221226

222227
if (!common_hal_audioio_audioout_get_playing(self)) {
223228
mp_raise_RuntimeError(translate("Not playing"));
@@ -233,7 +238,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(audioio_audioout_pause_obj, audioio_audioout_obj_pause
233238
//|
234239
STATIC mp_obj_t audioio_audioout_obj_resume(mp_obj_t self_in) {
235240
audioio_audioout_obj_t *self = MP_OBJ_TO_PTR(self_in);
236-
raise_error_if_deinited(common_hal_audioio_audioout_deinited(self));
241+
check_for_deinit(self);
237242

238243
if (common_hal_audioio_audioout_get_paused(self)) {
239244
common_hal_audioio_audioout_resume(self);
@@ -249,7 +254,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(audioio_audioout_resume_obj, audioio_audioout_obj_resu
249254
//|
250255
STATIC mp_obj_t audioio_audioout_obj_get_paused(mp_obj_t self_in) {
251256
audioio_audioout_obj_t *self = MP_OBJ_TO_PTR(self_in);
252-
raise_error_if_deinited(common_hal_audioio_audioout_deinited(self));
257+
check_for_deinit(self);
253258
return mp_obj_new_bool(common_hal_audioio_audioout_get_paused(self));
254259
}
255260
MP_DEFINE_CONST_FUN_OBJ_1(audioio_audioout_get_paused_obj, audioio_audioout_obj_get_paused);

‎shared-bindings/audioio/Mixer.c

+10-4
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,12 @@ STATIC mp_obj_t audioio_mixer_deinit(mp_obj_t self_in) {
121121
}
122122
STATIC MP_DEFINE_CONST_FUN_OBJ_1(audioio_mixer_deinit_obj, audioio_mixer_deinit);
123123

124+
STATIC void check_for_deinit(audioio_mixer_obj_t *self) {
125+
if (common_hal_audioio_mixer_deinited(self)) {
126+
raise_deinited_error();
127+
}
128+
}
129+
124130
//| .. method:: __enter__()
125131
//|
126132
//| No-op used by Context Managers.
@@ -157,7 +163,7 @@ STATIC mp_obj_t audioio_mixer_obj_play(size_t n_args, const mp_obj_t *pos_args,
157163
{ MP_QSTR_loop, MP_ARG_BOOL | MP_ARG_KW_ONLY, {.u_bool = false} },
158164
};
159165
audioio_mixer_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
160-
raise_error_if_deinited(common_hal_audioio_mixer_deinited(self));
166+
check_for_deinit(self);
161167
mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
162168
mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
163169

@@ -178,7 +184,7 @@ STATIC mp_obj_t audioio_mixer_obj_stop_voice(size_t n_args, const mp_obj_t *pos_
178184
{ MP_QSTR_voice, MP_ARG_INT, {.u_int = 0} },
179185
};
180186
audioio_mixer_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
181-
raise_error_if_deinited(common_hal_audioio_mixer_deinited(self));
187+
check_for_deinit(self);
182188
mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
183189
mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
184190

@@ -193,7 +199,7 @@ MP_DEFINE_CONST_FUN_OBJ_KW(audioio_mixer_stop_voice_obj, 1, audioio_mixer_obj_st
193199
//|
194200
STATIC mp_obj_t audioio_mixer_obj_get_playing(mp_obj_t self_in) {
195201
audioio_mixer_obj_t *self = MP_OBJ_TO_PTR(self_in);
196-
raise_error_if_deinited(common_hal_audioio_mixer_deinited(self));
202+
check_for_deinit(self);
197203
return mp_obj_new_bool(common_hal_audioio_mixer_get_playing(self));
198204
}
199205
MP_DEFINE_CONST_FUN_OBJ_1(audioio_mixer_get_playing_obj, audioio_mixer_obj_get_playing);
@@ -211,7 +217,7 @@ const mp_obj_property_t audioio_mixer_playing_obj = {
211217
//|
212218
STATIC mp_obj_t audioio_mixer_obj_get_sample_rate(mp_obj_t self_in) {
213219
audioio_mixer_obj_t *self = MP_OBJ_TO_PTR(self_in);
214-
raise_error_if_deinited(common_hal_audioio_mixer_deinited(self));
220+
check_for_deinit(self);
215221
return MP_OBJ_NEW_SMALL_INT(common_hal_audioio_mixer_get_sample_rate(self));
216222
}
217223
MP_DEFINE_CONST_FUN_OBJ_1(audioio_mixer_get_sample_rate_obj, audioio_mixer_obj_get_sample_rate);

‎shared-bindings/audioio/RawSample.c

+8-2
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,12 @@ STATIC mp_obj_t audioio_rawsample_deinit(mp_obj_t self_in) {
115115
}
116116
STATIC MP_DEFINE_CONST_FUN_OBJ_1(audioio_rawsample_deinit_obj, audioio_rawsample_deinit);
117117

118+
STATIC void check_for_deinit(audioio_rawsample_obj_t *self) {
119+
if (common_hal_audioio_rawsample_deinited(self)) {
120+
raise_deinited_error();
121+
}
122+
}
123+
118124
//| .. method:: __enter__()
119125
//|
120126
//| No-op used by Context Managers.
@@ -142,14 +148,14 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(audioio_rawsample___exit___obj, 4, 4,
142148
//|
143149
STATIC mp_obj_t audioio_rawsample_obj_get_sample_rate(mp_obj_t self_in) {
144150
audioio_rawsample_obj_t *self = MP_OBJ_TO_PTR(self_in);
145-
raise_error_if_deinited(common_hal_audioio_rawsample_deinited(self));
151+
check_for_deinit(self);
146152
return MP_OBJ_NEW_SMALL_INT(common_hal_audioio_rawsample_get_sample_rate(self));
147153
}
148154
MP_DEFINE_CONST_FUN_OBJ_1(audioio_rawsample_get_sample_rate_obj, audioio_rawsample_obj_get_sample_rate);
149155

150156
STATIC mp_obj_t audioio_rawsample_obj_set_sample_rate(mp_obj_t self_in, mp_obj_t sample_rate) {
151157
audioio_rawsample_obj_t *self = MP_OBJ_TO_PTR(self_in);
152-
raise_error_if_deinited(common_hal_audioio_rawsample_deinited(self));
158+
check_for_deinit(self);
153159
common_hal_audioio_rawsample_set_sample_rate(self, mp_obj_get_int(sample_rate));
154160
return mp_const_none;
155161
}

‎shared-bindings/audioio/WaveFile.c

+10-4
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,12 @@ STATIC mp_obj_t audioio_wavefile_deinit(mp_obj_t self_in) {
9292
}
9393
STATIC MP_DEFINE_CONST_FUN_OBJ_1(audioio_wavefile_deinit_obj, audioio_wavefile_deinit);
9494

95+
STATIC void check_for_deinit(audioio_wavefile_obj_t *self) {
96+
if (common_hal_audioio_wavefile_deinited(self)) {
97+
raise_deinited_error();
98+
}
99+
}
100+
95101
//| .. method:: __enter__()
96102
//|
97103
//| No-op used by Context Managers.
@@ -118,14 +124,14 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(audioio_wavefile___exit___obj, 4, 4,
118124
//|
119125
STATIC mp_obj_t audioio_wavefile_obj_get_sample_rate(mp_obj_t self_in) {
120126
audioio_wavefile_obj_t *self = MP_OBJ_TO_PTR(self_in);
121-
raise_error_if_deinited(common_hal_audioio_wavefile_deinited(self));
127+
check_for_deinit(self);
122128
return MP_OBJ_NEW_SMALL_INT(common_hal_audioio_wavefile_get_sample_rate(self));
123129
}
124130
MP_DEFINE_CONST_FUN_OBJ_1(audioio_wavefile_get_sample_rate_obj, audioio_wavefile_obj_get_sample_rate);
125131

126132
STATIC mp_obj_t audioio_wavefile_obj_set_sample_rate(mp_obj_t self_in, mp_obj_t sample_rate) {
127133
audioio_wavefile_obj_t *self = MP_OBJ_TO_PTR(self_in);
128-
raise_error_if_deinited(common_hal_audioio_wavefile_deinited(self));
134+
check_for_deinit(self);
129135
common_hal_audioio_wavefile_set_sample_rate(self, mp_obj_get_int(sample_rate));
130136
return mp_const_none;
131137
}
@@ -144,7 +150,7 @@ const mp_obj_property_t audioio_wavefile_sample_rate_obj = {
144150
//|
145151
STATIC mp_obj_t audioio_wavefile_obj_get_bits_per_sample(mp_obj_t self_in) {
146152
audioio_wavefile_obj_t *self = MP_OBJ_TO_PTR(self_in);
147-
raise_error_if_deinited(common_hal_audioio_wavefile_deinited(self));
153+
check_for_deinit(self);
148154
return MP_OBJ_NEW_SMALL_INT(common_hal_audioio_wavefile_get_bits_per_sample(self));
149155
}
150156
MP_DEFINE_CONST_FUN_OBJ_1(audioio_wavefile_get_bits_per_sample_obj, audioio_wavefile_obj_get_bits_per_sample);
@@ -162,7 +168,7 @@ const mp_obj_property_t audioio_wavefile_bits_per_sample_obj = {
162168
//|
163169
STATIC mp_obj_t audioio_wavefile_obj_get_channel_count(mp_obj_t self_in) {
164170
audioio_wavefile_obj_t *self = MP_OBJ_TO_PTR(self_in);
165-
raise_error_if_deinited(common_hal_audioio_wavefile_deinited(self));
171+
check_for_deinit(self);
166172
return MP_OBJ_NEW_SMALL_INT(common_hal_audioio_wavefile_get_channel_count(self));
167173
}
168174
MP_DEFINE_CONST_FUN_OBJ_1(audioio_wavefile_get_channel_count_obj, audioio_wavefile_obj_get_channel_count);

0 commit comments

Comments
 (0)