Skip to content

Commit 1bf6c58

Browse files
deanm1278deanm1278
committed
DM: mixer voice stuff
1 parent feef177 commit 1bf6c58

File tree

8 files changed

+60
-121
lines changed

8 files changed

+60
-121
lines changed

‎shared-bindings/audioio/Mixer.c

Lines changed: 3 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
*/
2626
#include "shared-bindings/audioio/Mixer.h"
2727
#include "shared-module/audioio/MixerVoice.h"
28+
#include "shared-bindings/audioio/MixerVoice.h"
2829

2930
#include <stdint.h>
3031

@@ -113,6 +114,7 @@ STATIC mp_obj_t audioio_mixer_make_new(const mp_obj_type_t *type, size_t n_args,
113114

114115
for(int v=0; v<voice_count; v++){
115116
self->voice[v] = audioio_mixervoice_type.make_new(&audioio_mixervoice_type, 0, 0, NULL);
117+
common_hal_audioio_mixervoice_set_parent(self->voice[v], self);
116118
}
117119
self->voice_tuple = mp_obj_new_tuple(self->voice_count, self->voice);
118120

@@ -148,54 +150,6 @@ STATIC mp_obj_t audioio_mixer_obj___exit__(size_t n_args, const mp_obj_t *args)
148150
}
149151
STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(audioio_mixer___exit___obj, 4, 4, audioio_mixer_obj___exit__);
150152

151-
152-
//| .. method:: play(sample, *, voice=0, loop=False)
153-
//|
154-
//| Plays the sample once when loop=False and continuously when loop=True.
155-
//| Does not block. Use `playing` to block.
156-
//|
157-
//| Sample must be an `audioio.WaveFile`, `audioio.Mixer` or `audioio.RawSample`.
158-
//|
159-
//| The sample must match the Mixer's encoding settings given in the constructor.
160-
//|
161-
STATIC mp_obj_t audioio_mixer_obj_play(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
162-
enum { ARG_sample, ARG_voice, ARG_loop };
163-
static const mp_arg_t allowed_args[] = {
164-
{ MP_QSTR_sample, MP_ARG_OBJ | MP_ARG_REQUIRED },
165-
{ MP_QSTR_voice, MP_ARG_INT | MP_ARG_KW_ONLY, {.u_int = 0} },
166-
{ MP_QSTR_loop, MP_ARG_BOOL | MP_ARG_KW_ONLY, {.u_bool = false} },
167-
};
168-
audioio_mixer_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
169-
raise_error_if_deinited(common_hal_audioio_mixer_deinited(self));
170-
mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
171-
mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
172-
173-
mp_obj_t sample = args[ARG_sample].u_obj;
174-
common_hal_audioio_mixer_play(self, sample, args[ARG_voice].u_int, args[ARG_loop].u_bool);
175-
176-
return mp_const_none;
177-
}
178-
MP_DEFINE_CONST_FUN_OBJ_KW(audioio_mixer_play_obj, 1, audioio_mixer_obj_play);
179-
180-
//| .. method:: stop_voice(voice=0)
181-
//|
182-
//| Stops playback of the sample on the given voice.
183-
//|
184-
STATIC mp_obj_t audioio_mixer_obj_stop_voice(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
185-
enum { ARG_voice };
186-
static const mp_arg_t allowed_args[] = {
187-
{ MP_QSTR_voice, MP_ARG_INT, {.u_int = 0} },
188-
};
189-
audioio_mixer_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
190-
raise_error_if_deinited(common_hal_audioio_mixer_deinited(self));
191-
mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
192-
mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
193-
194-
common_hal_audioio_mixer_stop_voice(self, args[ARG_voice].u_int);
195-
return mp_const_none;
196-
}
197-
MP_DEFINE_CONST_FUN_OBJ_KW(audioio_mixer_stop_voice_obj, 1, audioio_mixer_obj_stop_voice);
198-
199153
//| .. attribute:: playing
200154
//|
201155
//| True when any voice is being output. (read-only)
@@ -245,7 +199,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(audioio_mixer_get_voice_obj, audioio_mixer_obj_get_voi
245199

246200
const mp_obj_property_t audioio_mixer_voice_obj = {
247201
.base.type = &mp_type_property,
248-
.proxy = {(mp_obj_t)&audioio_mixer_obj_get_voice,
202+
.proxy = {(mp_obj_t)&audioio_mixer_get_voice_obj,
249203
(mp_obj_t)&mp_const_none_obj,
250204
(mp_obj_t)&mp_const_none_obj},
251205
};
@@ -256,8 +210,6 @@ STATIC const mp_rom_map_elem_t audioio_mixer_locals_dict_table[] = {
256210
{ MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&audioio_mixer_deinit_obj) },
257211
{ MP_ROM_QSTR(MP_QSTR___enter__), MP_ROM_PTR(&default___enter___obj) },
258212
{ MP_ROM_QSTR(MP_QSTR___exit__), MP_ROM_PTR(&audioio_mixer___exit___obj) },
259-
{ MP_ROM_QSTR(MP_QSTR_play), MP_ROM_PTR(&audioio_mixer_play_obj) },
260-
{ MP_ROM_QSTR(MP_QSTR_stop_voice), MP_ROM_PTR(&audioio_mixer_stop_voice_obj) },
261213

262214
// Properties
263215
{ MP_ROM_QSTR(MP_QSTR_playing), MP_ROM_PTR(&audioio_mixer_playing_obj) },

‎shared-bindings/audioio/Mixer.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,6 @@ void common_hal_audioio_mixer_construct(audioio_mixer_obj_t* self,
4444

4545
void common_hal_audioio_mixer_deinit(audioio_mixer_obj_t* self);
4646
bool common_hal_audioio_mixer_deinited(audioio_mixer_obj_t* self);
47-
void common_hal_audioio_mixer_play(audioio_mixer_obj_t* self, mp_obj_t sample, uint8_t voice, bool loop);
48-
void common_hal_audioio_mixer_stop_voice(audioio_mixer_obj_t* self, uint8_t voice);
49-
void common_hal_audioio_mixer_set_gain(audioio_mixer_obj_t* self, uint8_t voice, float gain);
50-
5147

5248
bool common_hal_audioio_mixer_get_playing(audioio_mixer_obj_t* self);
5349
uint32_t common_hal_audioio_mixer_get_sample_rate(audioio_mixer_obj_t* self);

‎shared-bindings/audioio/MixerVoice.c

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@
3636
STATIC mp_obj_t audioio_mixervoice_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *pos_args) {
3737
audioio_mixervoice_obj_t *self = m_new(audioio_mixervoice_obj_t, 1);
3838
self->base.type = &audioio_mixervoice_type;
39-
39+
self->sample = NULL;
40+
self->gain = ((1 << 15)-1);
4041
return MP_OBJ_FROM_PTR(self);
4142
}
4243

@@ -76,41 +77,38 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(audioio_mixervoice___exit___obj, 4, 4
7677
//| The sample must match the Mixer's encoding settings given in the constructor.
7778
//|
7879
STATIC mp_obj_t audioio_mixervoice_obj_play(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
79-
#if 0
8080
enum { ARG_sample, ARG_loop };
8181
static const mp_arg_t allowed_args[] = {
8282
{ MP_QSTR_sample, MP_ARG_OBJ | MP_ARG_REQUIRED },
8383
{ MP_QSTR_loop, MP_ARG_BOOL | MP_ARG_KW_ONLY, {.u_bool = false} },
8484
};
8585
audioio_mixervoice_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
86-
raise_error_if_deinited(common_hal_audioio_mixervoice_deinited(self));
86+
//raise_error_if_deinited(common_hal_audioio_mixervoice_deinited(self));
8787
mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
8888
mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
8989

9090
mp_obj_t sample = args[ARG_sample].u_obj;
91-
common_hal_audioio_mixer_play(self, sample, self->u_int, args[ARG_loop].u_ool);
92-
#endif
91+
common_hal_audioio_mixervoice_play(self, sample, args[ARG_loop].u_bool);
9392
return mp_const_none;
9493
}
9594
MP_DEFINE_CONST_FUN_OBJ_KW(audioio_mixervoice_play_obj, 1, audioio_mixervoice_obj_play);
9695

97-
//| .. method:: stop_voice()
96+
//| .. method:: stop()
9897
//|
9998
//| Stops playback of the sample on this voice.
10099
//|
101100
STATIC mp_obj_t audioio_mixervoice_obj_stop(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
102-
#if 0
103101
enum { ARG_voice };
104102
static const mp_arg_t allowed_args[] = {
105103
{ MP_QSTR_voice, MP_ARG_INT, {.u_int = 0} },
106104
};
107105
audioio_mixervoice_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
108-
raise_error_if_deinited(common_hal_audioio_mixer_deinited(self));
106+
//raise_error_if_deinited(common_hal_audioio_mixer_deinited(self));
109107
mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
110108
mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
111109

112-
common_hal_audioio_mixer_stop_voice(self, args[ARG_voice].u_int);
113-
#endif
110+
common_hal_audioio_mixervoice_stop(self);
111+
114112
return mp_const_none;
115113
}
116114
MP_DEFINE_CONST_FUN_OBJ_KW(audioio_mixervoice_stop_obj, 1, audioio_mixervoice_obj_stop);

‎shared-bindings/audioio/MixerVoice.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,13 @@
1212
#include "shared-module/audioio/Mixer.h"
1313
#include "shared-bindings/audioio/RawSample.h"
1414
#include "shared-module/audioio/MixerVoice.h"
15+
#include "shared-module/audioio/Mixer.h"
1516

1617
extern const mp_obj_type_t audioio_mixer_type;
1718
extern const mp_obj_type_t audioio_mixervoice_type;
1819

1920
void common_hal_audioio_mixervoice_deinit(audioio_mixervoice_obj_t* self);
21+
void common_hal_audioio_mixervoice_set_parent(audioio_mixervoice_obj_t* self, audioio_mixer_obj_t *parent);
2022
void common_hal_audioio_mixervoice_play(audioio_mixervoice_obj_t* self, mp_obj_t sample, bool loop);
2123
void common_hal_audioio_mixervoice_stop(audioio_mixervoice_obj_t* self);
2224
void common_hal_audioio_mixervoice_set_gain(audioio_mixervoice_obj_t* self, float gain);

‎shared-module/audioio/Mixer.c

Lines changed: 3 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
*/
2626

2727
#include "shared-bindings/audioio/Mixer.h"
28+
#include "shared-bindings/audioio/MixerVoice.h"
2829

2930
#include <stdint.h>
3031

@@ -58,13 +59,6 @@ void common_hal_audioio_mixer_construct(audioio_mixer_obj_t* self,
5859
self->channel_count = channel_count;
5960
self->sample_rate = sample_rate;
6061
self->voice_count = voice_count;
61-
62-
#if 0
63-
for (uint8_t i = 0; i < self->voice_count; i++) {
64-
self->voice[i].sample = NULL;
65-
self->voice[i].gain = ((1<<15)-1);
66-
}
67-
#endif
6862
}
6963

7064
void common_hal_audioio_mixer_deinit(audioio_mixer_obj_t* self) {
@@ -80,56 +74,12 @@ uint32_t common_hal_audioio_mixer_get_sample_rate(audioio_mixer_obj_t* self) {
8074
return self->sample_rate;
8175
}
8276

83-
void common_hal_audioio_mixer_play(audioio_mixer_obj_t* self, mp_obj_t sample, uint8_t v, bool loop) {
84-
if (v >= self->voice_count) {
85-
mp_raise_ValueError(translate("Voice index too high"));
86-
}
87-
if (audiosample_sample_rate(sample) != self->sample_rate) {
88-
mp_raise_ValueError(translate("The sample's sample rate does not match the mixer's"));
89-
}
90-
if (audiosample_channel_count(sample) != self->channel_count) {
91-
mp_raise_ValueError(translate("The sample's channel count does not match the mixer's"));
92-
}
93-
if (audiosample_bits_per_sample(sample) != self->bits_per_sample) {
94-
mp_raise_ValueError(translate("The sample's bits_per_sample does not match the mixer's"));
95-
}
96-
bool single_buffer;
97-
bool samples_signed;
98-
uint32_t max_buffer_length;
99-
uint8_t spacing;
100-
audiosample_get_buffer_structure(sample, false, &single_buffer, &samples_signed,
101-
&max_buffer_length, &spacing);
102-
if (samples_signed != self->samples_signed) {
103-
mp_raise_ValueError(translate("The sample's signedness does not match the mixer's"));
104-
}
105-
#if 0
106-
audioio_mixervoice_obj_t* voice = &self->voice[v];
107-
voice->sample = sample;
108-
voice->loop = loop;
109-
110-
audiosample_reset_buffer(sample, false, 0);
111-
audioio_get_buffer_result_t result = audiosample_get_buffer(sample, false, 0, (uint8_t**) &voice->remaining_buffer, &voice->buffer_length);
112-
// Track length in terms of words.
113-
voice->buffer_length /= sizeof(uint32_t);
114-
voice->more_data = result == GET_BUFFER_MORE_DATA;
115-
116-
#endif
117-
}
118-
119-
void common_hal_audioio_mixer_stop_voice(audioio_mixer_obj_t* self, uint8_t voice) {
120-
#if 0
121-
self->voice[voice].sample = NULL;
122-
#endif
123-
}
124-
12577
bool common_hal_audioio_mixer_get_playing(audioio_mixer_obj_t* self) {
126-
#if 0
12778
for (int32_t v = 0; v < self->voice_count; v++) {
128-
if (self->voice[v].sample != NULL) {
79+
if (common_hal_audioio_mixervoice_get_playing(MP_OBJ_TO_PTR(self->voice[v]))) {
12980
return true;
13081
}
13182
}
132-
#endif
13383
return false;
13484
}
13585

@@ -294,7 +244,6 @@ audioio_get_buffer_result_t audioio_mixer_get_buffer(audioio_mixer_obj_t* self,
294244
uint8_t channel,
295245
uint8_t** buffer,
296246
uint32_t* buffer_length) {
297-
#if 0
298247
if (!single_channel) {
299248
channel = 0;
300249
}
@@ -318,7 +267,7 @@ audioio_get_buffer_result_t audioio_mixer_get_buffer(audioio_mixer_obj_t* self,
318267
self->use_first_buffer = !self->use_first_buffer;
319268
bool voices_active = false;
320269
for (int32_t v = 0; v < self->voice_count; v++) {
321-
audioio_mixervoice_obj_t* voice = &self->voice[v];
270+
audioio_mixervoice_obj_t* voice = MP_OBJ_TO_PTR(self->voice[v]);
322271

323272
uint32_t j = 0;
324273
bool voice_done = voice->sample == NULL;
@@ -415,7 +364,6 @@ audioio_get_buffer_result_t audioio_mixer_get_buffer(audioio_mixer_obj_t* self,
415364
self->right_read_count += 1;
416365
*buffer = *buffer + self->bits_per_sample / 8;
417366
}
418-
#endif
419367
return GET_BUFFER_MORE_DATA;
420368
}
421369

‎shared-module/audioio/Mixer.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
#include "py/objtuple.h"
3232

3333
#include "shared-module/audioio/__init__.h"
34-
#include "shared-bindings/audioio/MixerVoice.h"
3534

3635
typedef struct {
3736
mp_obj_base_t base;

‎shared-module/audioio/MixerVoice.c

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,49 @@
1212
#include "py/runtime.h"
1313
#include "shared-module/audioio/__init__.h"
1414
#include "shared-module/audioio/RawSample.h"
15+
#include "shared-module/audioio/MixerVoice.h"
16+
17+
void common_hal_audioio_mixervoice_set_parent(audioio_mixervoice_obj_t* self, audioio_mixer_obj_t *parent) {
18+
self->parent = parent;
19+
}
1520

1621
void common_hal_audioio_mixervoice_set_gain(audioio_mixervoice_obj_t* self, float gain) {
1722
self->gain = gain * ((1 << 15)-1);
1823
}
24+
25+
void common_hal_audioio_mixervoice_play(audioio_mixervoice_obj_t* self, mp_obj_t sample, bool loop) {
26+
if (audiosample_sample_rate(sample) != self->parent->sample_rate) {
27+
mp_raise_ValueError(translate("The sample's sample rate does not match the mixer's"));
28+
}
29+
if (audiosample_channel_count(sample) != self->parent->channel_count) {
30+
mp_raise_ValueError(translate("The sample's channel count does not match the mixer's"));
31+
}
32+
if (audiosample_bits_per_sample(sample) != self->parent->bits_per_sample) {
33+
mp_raise_ValueError(translate("The sample's bits_per_sample does not match the mixer's"));
34+
}
35+
bool single_buffer;
36+
bool samples_signed;
37+
uint32_t max_buffer_length;
38+
uint8_t spacing;
39+
audiosample_get_buffer_structure(sample, false, &single_buffer, &samples_signed,
40+
&max_buffer_length, &spacing);
41+
if (samples_signed != self->parent->samples_signed) {
42+
mp_raise_ValueError(translate("The sample's signedness does not match the mixer's"));
43+
}
44+
self->sample = sample;
45+
self->loop = loop;
46+
47+
audiosample_reset_buffer(sample, false, 0);
48+
audioio_get_buffer_result_t result = audiosample_get_buffer(sample, false, 0, (uint8_t**) &self->remaining_buffer, &self->buffer_length);
49+
// Track length in terms of words.
50+
self->buffer_length /= sizeof(uint32_t);
51+
self->more_data = result == GET_BUFFER_MORE_DATA;
52+
}
53+
54+
bool common_hal_audioio_mixervoice_get_playing(audioio_mixervoice_obj_t* self) {
55+
return self->sample != NULL;
56+
}
57+
58+
void common_hal_audioio_mixervoice_stop(audioio_mixervoice_obj_t* self) {
59+
self->sample = NULL;
60+
}

‎shared-module/audioio/MixerVoice.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,11 @@
1111
#include "py/obj.h"
1212

1313
#include "shared-module/audioio/__init__.h"
14+
#include "shared-module/audioio/Mixer.h"
1415

1516
typedef struct {
1617
mp_obj_base_t base;
18+
audioio_mixer_obj_t *parent;
1719
mp_obj_t sample;
1820
bool loop;
1921
bool more_data;

0 commit comments

Comments
 (0)