Skip to content

Commit 3206d9a

Browse files
dhalbertdhalbert
authored
Merge pull request #1242 from tannewt/mixer
Introduce audioio.Mixer to allow for multiple sample playback
2 parents e9aefcc + 570ac05 commit 3206d9a

File tree

21 files changed

+1274
-159
lines changed

21 files changed

+1274
-159
lines changed

‎locale/circuitpython.pot

Lines changed: 46 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: PACKAGE VERSION\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2018-10-07 02:07+0300\n"
11+
"POT-Creation-Date: 2018-10-09 13:56-0700\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <[email protected]>\n"
@@ -218,7 +218,7 @@ msgstr ""
218218
msgid "soft reboot\n"
219219
msgstr ""
220220

221-
#: ports/atmel-samd/audio_dma.c:285
221+
#: ports/atmel-samd/audio_dma.c:209
222222
#: ports/atmel-samd/common-hal/audiobusio/PDMIn.c:361
223223
msgid "All sync event channels in use"
224224
msgstr ""
@@ -2026,6 +2026,22 @@ msgid ""
20262026
"destination buffer must be a bytearray or array of type 'B' for bit_depth = 8"
20272027
msgstr ""
20282028

2029+
#: shared-bindings/audioio/Mixer.c:94
2030+
msgid "Invalid voice count"
2031+
msgstr ""
2032+
2033+
#: shared-bindings/audioio/Mixer.c:99
2034+
msgid "Invalid channel count"
2035+
msgstr ""
2036+
2037+
#: shared-bindings/audioio/Mixer.c:103
2038+
msgid "Sample rate must be positive"
2039+
msgstr ""
2040+
2041+
#: shared-bindings/audioio/Mixer.c:107
2042+
msgid "bits_per_sample must be 8 or 16"
2043+
msgstr ""
2044+
20292045
#: shared-bindings/audioio/RawSample.c:98
20302046
msgid ""
20312047
"sample_source buffer must be a bytearray or array of type 'h', 'H', 'b' or "
@@ -2316,6 +2332,34 @@ msgid ""
23162332
"Object has been deinitialized and can no longer be used. Create a new object."
23172333
msgstr ""
23182334

2335+
#: shared-module/audioio/Mixer.c:47 shared-module/audioio/WaveFile.c:117
2336+
msgid "Couldn't allocate first buffer"
2337+
msgstr ""
2338+
2339+
#: shared-module/audioio/Mixer.c:53 shared-module/audioio/WaveFile.c:123
2340+
msgid "Couldn't allocate second buffer"
2341+
msgstr ""
2342+
2343+
#: shared-module/audioio/Mixer.c:82
2344+
msgid "Voice index too high"
2345+
msgstr ""
2346+
2347+
#: shared-module/audioio/Mixer.c:85
2348+
msgid "The sample's sample rate does not match the mixer's"
2349+
msgstr ""
2350+
2351+
#: shared-module/audioio/Mixer.c:88
2352+
msgid "The sample's channel count does not match the mixer's"
2353+
msgstr ""
2354+
2355+
#: shared-module/audioio/Mixer.c:91
2356+
msgid "The sample's bits_per_sample does not match the mixer's"
2357+
msgstr ""
2358+
2359+
#: shared-module/audioio/Mixer.c:100
2360+
msgid "The sample's signedness does not match the mixer's"
2361+
msgstr ""
2362+
23192363
#: shared-module/audioio/WaveFile.c:61
23202364
msgid "Invalid wave file"
23212365
msgstr ""
@@ -2336,14 +2380,6 @@ msgstr ""
23362380
msgid "Invalid file"
23372381
msgstr ""
23382382

2339-
#: shared-module/audioio/WaveFile.c:117
2340-
msgid "Couldn't allocate first buffer"
2341-
msgstr ""
2342-
2343-
#: shared-module/audioio/WaveFile.c:123
2344-
msgid "Couldn't allocate second buffer"
2345-
msgstr ""
2346-
23472383
#: shared-module/bitbangio/I2C.c:58
23482384
msgid "Clock stretch too long"
23492385
msgstr ""

‎locale/de_DE.po

Lines changed: 48 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ msgstr ""
227227
msgid "soft reboot\n"
228228
msgstr "weicher reboot\n"
229229

230-
#: ports/atmel-samd/audio_dma.c:285
230+
#: ports/atmel-samd/audio_dma.c:209
231231
#: ports/atmel-samd/common-hal/audiobusio/PDMIn.c:361
232232
msgid "All sync event channels in use"
233233
msgstr "Alle sync event Kanäle werden benutzt"
@@ -2040,6 +2040,25 @@ msgid ""
20402040
"destination buffer must be a bytearray or array of type 'B' for bit_depth = 8"
20412041
msgstr ""
20422042

2043+
#: shared-bindings/audioio/Mixer.c:94
2044+
#, fuzzy
2045+
msgid "Invalid voice count"
2046+
msgstr "Ungültiger clock pin"
2047+
2048+
#: shared-bindings/audioio/Mixer.c:99
2049+
#, fuzzy
2050+
msgid "Invalid channel count"
2051+
msgstr "Ungültiger clock pin"
2052+
2053+
#: shared-bindings/audioio/Mixer.c:103
2054+
msgid "Sample rate must be positive"
2055+
msgstr ""
2056+
2057+
#: shared-bindings/audioio/Mixer.c:107
2058+
#, fuzzy
2059+
msgid "bits_per_sample must be 8 or 16"
2060+
msgstr "bits müssen 8 sein"
2061+
20432062
#: shared-bindings/audioio/RawSample.c:98
20442063
msgid ""
20452064
"sample_source buffer must be a bytearray or array of type 'h', 'H', 'b' or "
@@ -2331,6 +2350,34 @@ msgid ""
23312350
"Object has been deinitialized and can no longer be used. Create a new object."
23322351
msgstr ""
23332352

2353+
#: shared-module/audioio/Mixer.c:47 shared-module/audioio/WaveFile.c:117
2354+
msgid "Couldn't allocate first buffer"
2355+
msgstr ""
2356+
2357+
#: shared-module/audioio/Mixer.c:53 shared-module/audioio/WaveFile.c:123
2358+
msgid "Couldn't allocate second buffer"
2359+
msgstr ""
2360+
2361+
#: shared-module/audioio/Mixer.c:82
2362+
msgid "Voice index too high"
2363+
msgstr ""
2364+
2365+
#: shared-module/audioio/Mixer.c:85
2366+
msgid "The sample's sample rate does not match the mixer's"
2367+
msgstr ""
2368+
2369+
#: shared-module/audioio/Mixer.c:88
2370+
msgid "The sample's channel count does not match the mixer's"
2371+
msgstr ""
2372+
2373+
#: shared-module/audioio/Mixer.c:91
2374+
msgid "The sample's bits_per_sample does not match the mixer's"
2375+
msgstr ""
2376+
2377+
#: shared-module/audioio/Mixer.c:100
2378+
msgid "The sample's signedness does not match the mixer's"
2379+
msgstr ""
2380+
23342381
#: shared-module/audioio/WaveFile.c:61
23352382
msgid "Invalid wave file"
23362383
msgstr ""
@@ -2351,14 +2398,6 @@ msgstr ""
23512398
msgid "Invalid file"
23522399
msgstr ""
23532400

2354-
#: shared-module/audioio/WaveFile.c:117
2355-
msgid "Couldn't allocate first buffer"
2356-
msgstr ""
2357-
2358-
#: shared-module/audioio/WaveFile.c:123
2359-
msgid "Couldn't allocate second buffer"
2360-
msgstr ""
2361-
23622401
#: shared-module/bitbangio/I2C.c:58
23632402
msgid "Clock stretch too long"
23642403
msgstr ""

‎locale/en_US.po

Lines changed: 45 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ msgstr ""
218218
msgid "soft reboot\n"
219219
msgstr ""
220220

221-
#: ports/atmel-samd/audio_dma.c:285
221+
#: ports/atmel-samd/audio_dma.c:209
222222
#: ports/atmel-samd/common-hal/audiobusio/PDMIn.c:361
223223
msgid "All sync event channels in use"
224224
msgstr ""
@@ -2026,6 +2026,22 @@ msgid ""
20262026
"destination buffer must be a bytearray or array of type 'B' for bit_depth = 8"
20272027
msgstr ""
20282028

2029+
#: shared-bindings/audioio/Mixer.c:94
2030+
msgid "Invalid voice count"
2031+
msgstr ""
2032+
2033+
#: shared-bindings/audioio/Mixer.c:99
2034+
msgid "Invalid channel count"
2035+
msgstr ""
2036+
2037+
#: shared-bindings/audioio/Mixer.c:103
2038+
msgid "Sample rate must be positive"
2039+
msgstr ""
2040+
2041+
#: shared-bindings/audioio/Mixer.c:107
2042+
msgid "bits_per_sample must be 8 or 16"
2043+
msgstr ""
2044+
20292045
#: shared-bindings/audioio/RawSample.c:98
20302046
msgid ""
20312047
"sample_source buffer must be a bytearray or array of type 'h', 'H', 'b' or "
@@ -2316,6 +2332,34 @@ msgid ""
23162332
"Object has been deinitialized and can no longer be used. Create a new object."
23172333
msgstr ""
23182334

2335+
#: shared-module/audioio/Mixer.c:47 shared-module/audioio/WaveFile.c:117
2336+
msgid "Couldn't allocate first buffer"
2337+
msgstr ""
2338+
2339+
#: shared-module/audioio/Mixer.c:53 shared-module/audioio/WaveFile.c:123
2340+
msgid "Couldn't allocate second buffer"
2341+
msgstr ""
2342+
2343+
#: shared-module/audioio/Mixer.c:82
2344+
msgid "Voice index too high"
2345+
msgstr ""
2346+
2347+
#: shared-module/audioio/Mixer.c:85
2348+
msgid "The sample's sample rate does not match the mixer's"
2349+
msgstr ""
2350+
2351+
#: shared-module/audioio/Mixer.c:88
2352+
msgid "The sample's channel count does not match the mixer's"
2353+
msgstr ""
2354+
2355+
#: shared-module/audioio/Mixer.c:91
2356+
msgid "The sample's bits_per_sample does not match the mixer's"
2357+
msgstr ""
2358+
2359+
#: shared-module/audioio/Mixer.c:100
2360+
msgid "The sample's signedness does not match the mixer's"
2361+
msgstr ""
2362+
23192363
#: shared-module/audioio/WaveFile.c:61
23202364
msgid "Invalid wave file"
23212365
msgstr ""
@@ -2336,14 +2380,6 @@ msgstr ""
23362380
msgid "Invalid file"
23372381
msgstr ""
23382382

2339-
#: shared-module/audioio/WaveFile.c:117
2340-
msgid "Couldn't allocate first buffer"
2341-
msgstr ""
2342-
2343-
#: shared-module/audioio/WaveFile.c:123
2344-
msgid "Couldn't allocate second buffer"
2345-
msgstr ""
2346-
23472383
#: shared-module/bitbangio/I2C.c:58
23482384
msgid "Clock stretch too long"
23492385
msgstr ""

‎locale/es.po

Lines changed: 49 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ msgstr ""
233233
msgid "soft reboot\n"
234234
msgstr "reinicio suave\n"
235235

236-
#: ports/atmel-samd/audio_dma.c:285
236+
#: ports/atmel-samd/audio_dma.c:209
237237
#: ports/atmel-samd/common-hal/audiobusio/PDMIn.c:361
238238
msgid "All sync event channels in use"
239239
msgstr "Todos los sync event channels están siendo utilizados"
@@ -2067,6 +2067,26 @@ msgid ""
20672067
"destination buffer must be a bytearray or array of type 'B' for bit_depth = 8"
20682068
msgstr ""
20692069

2070+
#: shared-bindings/audioio/Mixer.c:94
2071+
#, fuzzy
2072+
msgid "Invalid voice count"
2073+
msgstr "Dirección inválida."
2074+
2075+
#: shared-bindings/audioio/Mixer.c:99
2076+
#, fuzzy
2077+
msgid "Invalid channel count"
2078+
msgstr "argumentos inválidos"
2079+
2080+
#: shared-bindings/audioio/Mixer.c:103
2081+
#, fuzzy
2082+
msgid "Sample rate must be positive"
2083+
msgstr "STA debe estar activo"
2084+
2085+
#: shared-bindings/audioio/Mixer.c:107
2086+
#, fuzzy
2087+
msgid "bits_per_sample must be 8 or 16"
2088+
msgstr "bits debe ser 8"
2089+
20702090
#: shared-bindings/audioio/RawSample.c:98
20712091
msgid ""
20722092
"sample_source buffer must be a bytearray or array of type 'h', 'H', 'b' or "
@@ -2359,6 +2379,34 @@ msgid ""
23592379
"Object has been deinitialized and can no longer be used. Create a new object."
23602380
msgstr ""
23612381

2382+
#: shared-module/audioio/Mixer.c:47 shared-module/audioio/WaveFile.c:117
2383+
msgid "Couldn't allocate first buffer"
2384+
msgstr ""
2385+
2386+
#: shared-module/audioio/Mixer.c:53 shared-module/audioio/WaveFile.c:123
2387+
msgid "Couldn't allocate second buffer"
2388+
msgstr ""
2389+
2390+
#: shared-module/audioio/Mixer.c:82
2391+
msgid "Voice index too high"
2392+
msgstr ""
2393+
2394+
#: shared-module/audioio/Mixer.c:85
2395+
msgid "The sample's sample rate does not match the mixer's"
2396+
msgstr ""
2397+
2398+
#: shared-module/audioio/Mixer.c:88
2399+
msgid "The sample's channel count does not match the mixer's"
2400+
msgstr ""
2401+
2402+
#: shared-module/audioio/Mixer.c:91
2403+
msgid "The sample's bits_per_sample does not match the mixer's"
2404+
msgstr ""
2405+
2406+
#: shared-module/audioio/Mixer.c:100
2407+
msgid "The sample's signedness does not match the mixer's"
2408+
msgstr ""
2409+
23622410
#: shared-module/audioio/WaveFile.c:61
23632411
msgid "Invalid wave file"
23642412
msgstr ""
@@ -2379,14 +2427,6 @@ msgstr ""
23792427
msgid "Invalid file"
23802428
msgstr ""
23812429

2382-
#: shared-module/audioio/WaveFile.c:117
2383-
msgid "Couldn't allocate first buffer"
2384-
msgstr ""
2385-
2386-
#: shared-module/audioio/WaveFile.c:123
2387-
msgid "Couldn't allocate second buffer"
2388-
msgstr ""
2389-
23902430
#: shared-module/bitbangio/I2C.c:58
23912431
msgid "Clock stretch too long"
23922432
msgstr ""

0 commit comments

Comments
 (0)