Skip to content

Commit 908e134

Browse files
committed
Return self object from play methods to allow for chaining
1 parent 2317aec commit 908e134

File tree

9 files changed

+18
-18
lines changed

9 files changed

+18
-18
lines changed

shared-bindings/audiodelays/Chorus.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(audiodelays_chorus_get_playing_obj, audiodelays_chorus
206206
MP_PROPERTY_GETTER(audiodelays_chorus_playing_obj,
207207
(mp_obj_t)&audiodelays_chorus_get_playing_obj);
208208

209-
//| def play(self, sample: circuitpython_typing.AudioSample, *, loop: bool = False) -> None:
209+
//| def play(self, sample: circuitpython_typing.AudioSample, *, loop: bool = False) -> Chorus:
210210
//| """Plays the sample once when loop=False and continuously when loop=True.
211211
//| Does not block. Use `playing` to block.
212212
//|
@@ -228,7 +228,7 @@ static mp_obj_t audiodelays_chorus_obj_play(size_t n_args, const mp_obj_t *pos_a
228228
mp_obj_t sample = args[ARG_sample].u_obj;
229229
common_hal_audiodelays_chorus_play(self, sample, args[ARG_loop].u_bool);
230230

231-
return mp_const_none;
231+
return pos_args[0];
232232
}
233233
MP_DEFINE_CONST_FUN_OBJ_KW(audiodelays_chorus_play_obj, 1, audiodelays_chorus_obj_play);
234234

shared-bindings/audiodelays/Echo.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(audiodelays_echo_get_playing_obj, audiodelays_echo_obj
230230
MP_PROPERTY_GETTER(audiodelays_echo_playing_obj,
231231
(mp_obj_t)&audiodelays_echo_get_playing_obj);
232232

233-
//| def play(self, sample: circuitpython_typing.AudioSample, *, loop: bool = False) -> None:
233+
//| def play(self, sample: circuitpython_typing.AudioSample, *, loop: bool = False) -> Echo:
234234
//| """Plays the sample once when loop=False and continuously when loop=True.
235235
//| Does not block. Use `playing` to block.
236236
//|
@@ -252,7 +252,7 @@ static mp_obj_t audiodelays_echo_obj_play(size_t n_args, const mp_obj_t *pos_arg
252252
mp_obj_t sample = args[ARG_sample].u_obj;
253253
common_hal_audiodelays_echo_play(self, sample, args[ARG_loop].u_bool);
254254

255-
return mp_const_none;
255+
return pos_args[0];
256256
}
257257
MP_DEFINE_CONST_FUN_OBJ_KW(audiodelays_echo_play_obj, 1, audiodelays_echo_obj_play);
258258

shared-bindings/audiodelays/MultiTapDelay.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(audiodelays_multi_tap_delay_get_playing_obj, audiodela
233233
MP_PROPERTY_GETTER(audiodelays_multi_tap_delay_playing_obj,
234234
(mp_obj_t)&audiodelays_multi_tap_delay_get_playing_obj);
235235

236-
//| def play(self, sample: circuitpython_typing.AudioSample, *, loop: bool = False) -> None:
236+
//| def play(self, sample: circuitpython_typing.AudioSample, *, loop: bool = False) -> MultiTapDelay:
237237
//| """Plays the sample once when loop=False and continuously when loop=True.
238238
//| Does not block. Use `playing` to block.
239239
//|
@@ -255,7 +255,7 @@ static mp_obj_t audiodelays_multi_tap_delay_obj_play(size_t n_args, const mp_obj
255255
mp_obj_t sample = args[ARG_sample].u_obj;
256256
common_hal_audiodelays_multi_tap_delay_play(self, sample, args[ARG_loop].u_bool);
257257

258-
return mp_const_none;
258+
return pos_args[0];
259259
}
260260
MP_DEFINE_CONST_FUN_OBJ_KW(audiodelays_multi_tap_delay_play_obj, 1, audiodelays_multi_tap_delay_obj_play);
261261

shared-bindings/audiodelays/PitchShift.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ MP_PROPERTY_GETTER(audiodelays_pitch_shift_playing_obj,
190190
(mp_obj_t)&audiodelays_pitch_shift_get_playing_obj);
191191

192192

193-
//| def play(self, sample: circuitpython_typing.AudioSample, *, loop: bool = False) -> None:
193+
//| def play(self, sample: circuitpython_typing.AudioSample, *, loop: bool = False) -> PitchShift:
194194
//| """Plays the sample once when loop=False and continuously when loop=True.
195195
//| Does not block. Use `playing` to block.
196196
//|
@@ -211,7 +211,7 @@ static mp_obj_t audiodelays_pitch_shift_obj_play(size_t n_args, const mp_obj_t *
211211
mp_obj_t sample = args[ARG_sample].u_obj;
212212
common_hal_audiodelays_pitch_shift_play(self, sample, args[ARG_loop].u_bool);
213213

214-
return mp_const_none;
214+
return pos_args[0];
215215
}
216216
MP_DEFINE_CONST_FUN_OBJ_KW(audiodelays_pitch_shift_play_obj, 1, audiodelays_pitch_shift_obj_play);
217217

shared-bindings/audiofilters/Distortion.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(audiofilters_distortion_get_playing_obj, audiofilters_
309309
MP_PROPERTY_GETTER(audiofilters_distortion_playing_obj,
310310
(mp_obj_t)&audiofilters_distortion_get_playing_obj);
311311

312-
//| def play(self, sample: circuitpython_typing.AudioSample, *, loop: bool = False) -> None:
312+
//| def play(self, sample: circuitpython_typing.AudioSample, *, loop: bool = False) -> Distortion:
313313
//| """Plays the sample once when loop=False and continuously when loop=True.
314314
//| Does not block. Use `playing` to block.
315315
//|
@@ -331,7 +331,7 @@ static mp_obj_t audiofilters_distortion_obj_play(size_t n_args, const mp_obj_t *
331331
mp_obj_t sample = args[ARG_sample].u_obj;
332332
common_hal_audiofilters_distortion_play(self, sample, args[ARG_loop].u_bool);
333333

334-
return mp_const_none;
334+
return pos_args[0];
335335
}
336336
MP_DEFINE_CONST_FUN_OBJ_KW(audiofilters_distortion_play_obj, 1, audiofilters_distortion_obj_play);
337337

shared-bindings/audiofilters/Filter.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(audiofilters_filter_get_playing_obj, audiofilters_filt
179179
MP_PROPERTY_GETTER(audiofilters_filter_playing_obj,
180180
(mp_obj_t)&audiofilters_filter_get_playing_obj);
181181

182-
//| def play(self, sample: circuitpython_typing.AudioSample, *, loop: bool = False) -> None:
182+
//| def play(self, sample: circuitpython_typing.AudioSample, *, loop: bool = False) -> Filter:
183183
//| """Plays the sample once when loop=False and continuously when loop=True.
184184
//| Does not block. Use `playing` to block.
185185
//|
@@ -201,7 +201,7 @@ static mp_obj_t audiofilters_filter_obj_play(size_t n_args, const mp_obj_t *pos_
201201
mp_obj_t sample = args[ARG_sample].u_obj;
202202
common_hal_audiofilters_filter_play(self, sample, args[ARG_loop].u_bool);
203203

204-
return mp_const_none;
204+
return pos_args[0];
205205
}
206206
MP_DEFINE_CONST_FUN_OBJ_KW(audiofilters_filter_play_obj, 1, audiofilters_filter_obj_play);
207207

shared-bindings/audiofilters/Phaser.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(audiofilters_phaser_get_playing_obj, audiofilters_phas
214214
MP_PROPERTY_GETTER(audiofilters_phaser_playing_obj,
215215
(mp_obj_t)&audiofilters_phaser_get_playing_obj);
216216

217-
//| def play(self, sample: circuitpython_typing.AudioSample, *, loop: bool = False) -> None:
217+
//| def play(self, sample: circuitpython_typing.AudioSample, *, loop: bool = False) -> Phaser:
218218
//| """Plays the sample once when loop=False and continuously when loop=True.
219219
//| Does not block. Use `playing` to block.
220220
//|
@@ -236,7 +236,7 @@ static mp_obj_t audiofilters_phaser_obj_play(size_t n_args, const mp_obj_t *pos_
236236
mp_obj_t sample = args[ARG_sample].u_obj;
237237
common_hal_audiofilters_phaser_play(self, sample, args[ARG_loop].u_bool);
238238

239-
return mp_const_none;
239+
return pos_args[0];
240240
}
241241
MP_DEFINE_CONST_FUN_OBJ_KW(audiofilters_phaser_play_obj, 1, audiofilters_phaser_obj_play);
242242

shared-bindings/audiofreeverb/Freeverb.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(audiofreeverb_freeverb_get_playing_obj, audiofreeverb_
196196
MP_PROPERTY_GETTER(audiofreeverb_freeverb_playing_obj,
197197
(mp_obj_t)&audiofreeverb_freeverb_get_playing_obj);
198198

199-
//| def play(self, sample: circuitpython_typing.AudioSample, *, loop: bool = False) -> None:
199+
//| def play(self, sample: circuitpython_typing.AudioSample, *, loop: bool = False) -> Freeverb:
200200
//| """Plays the sample once when loop=False and continuously when loop=True.
201201
//| Does not block. Use `playing` to block.
202202
//|
@@ -218,7 +218,7 @@ static mp_obj_t audiofreeverb_freeverb_obj_play(size_t n_args, const mp_obj_t *p
218218
mp_obj_t sample = args[ARG_sample].u_obj;
219219
common_hal_audiofreeverb_freeverb_play(self, sample, args[ARG_loop].u_bool);
220220

221-
return mp_const_none;
221+
return pos_args[0];
222222
}
223223
MP_DEFINE_CONST_FUN_OBJ_KW(audiofreeverb_freeverb_play_obj, 1, audiofreeverb_freeverb_obj_play);
224224

shared-bindings/audiomixer/Mixer.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ MP_PROPERTY_GETTER(audiomixer_mixer_voice_obj,
160160

161161
//| def play(
162162
//| self, sample: circuitpython_typing.AudioSample, *, voice: int = 0, loop: bool = False
163-
//| ) -> None:
163+
//| ) -> Mixer:
164164
//| """Plays the sample once when loop=False and continuously when loop=True.
165165
//| Does not block. Use `playing` to block.
166166
//|
@@ -189,7 +189,7 @@ static mp_obj_t audiomixer_mixer_obj_play(size_t n_args, const mp_obj_t *pos_arg
189189
mp_obj_t sample = args[ARG_sample].u_obj;
190190
common_hal_audiomixer_mixervoice_play(voice, sample, args[ARG_loop].u_bool);
191191

192-
return mp_const_none;
192+
return pos_args[0];
193193
}
194194
MP_DEFINE_CONST_FUN_OBJ_KW(audiomixer_mixer_play_obj, 1, audiomixer_mixer_obj_play);
195195

0 commit comments

Comments
 (0)