Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Audio effects #9640

Merged
merged 25 commits into from
Oct 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
5e92303
Initial audio effects commit
gamblor21 Sep 13, 2024
a950349
Changes to properly handle samples
gamblor21 Sep 15, 2024
ac5ccdb
Renamed module
gamblor21 Sep 17, 2024
4da22c5
Add mix parameter
gamblor21 Sep 19, 2024
d88b0c7
Change mix to BlockInput
gamblor21 Sep 21, 2024
4774807
Delay and Decay to BlockInput
gamblor21 Sep 22, 2024
01a220a
Started simplifying getbuffer
gamblor21 Sep 24, 2024
98b360a
Double buffering
gamblor21 Sep 25, 2024
a851f10
Error message for sample note matching made consistent
gamblor21 Sep 28, 2024
bbd3e01
Comments and couple tweaks
gamblor21 Sep 28, 2024
70c0bf9
8 bit unsigned samples working
gamblor21 Sep 30, 2024
00a149a
More comments and cleanup
gamblor21 Sep 30, 2024
3c20460
Fixed incorrectly updating sample remaining pointer
gamblor21 Oct 1, 2024
af93217
Documentation
gamblor21 Oct 2, 2024
f5a8e3d
Calculate current delay for a BlockInput correctly
gamblor21 Oct 4, 2024
af171da
Merge branch 'main' into audio_effects
gamblor21 Oct 4, 2024
cca8d00
Doc and error messaging changes
gamblor21 Oct 5, 2024
d2e5173
Merge remote-tracking branch 'origin/audio_effects' into audio_effects
gamblor21 Oct 5, 2024
146c13e
Improved documentation
gamblor21 Oct 5, 2024
0fa3cd8
Removed utils.h which was not required
gamblor21 Oct 5, 2024
48e1327
Fix about incorrectly recalculating delay
gamblor21 Oct 7, 2024
af947a5
Enable for all 2350 boards
gamblor21 Oct 8, 2024
4464531
Rename defn to add audiodelays
gamblor21 Oct 12, 2024
e3228d0
Added frequency shift on echo option from @dcooperdalrymple
gamblor21 Oct 14, 2024
064c2d8
Fixed renaming the defines for audioeffects incorrectly
gamblor21 Oct 14, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 3 additions & 15 deletions locale/circuitpython.pot
Original file line number Diff line number Diff line change
Expand Up @@ -1965,20 +1965,8 @@ msgstr ""
msgid "The length of rgb_pins must be 6, 12, 18, 24, or 30"
msgstr ""

#: shared-module/audiomixer/MixerVoice.c
msgid "The sample's bits_per_sample does not match the mixer's"
msgstr ""

#: shared-module/audiomixer/MixerVoice.c
msgid "The sample's channel count does not match the mixer's"
msgstr ""

#: shared-module/audiomixer/MixerVoice.c
msgid "The sample's sample rate does not match the mixer's"
msgstr ""

#: shared-module/audiomixer/MixerVoice.c
msgid "The sample's signedness does not match the mixer's"
#: shared-module/audiodelays/Echo.c shared-module/audiomixer/MixerVoice.c
msgid "The sample's %q does not match"
msgstr ""

#: supervisor/shared/safe_mode.c
Expand Down Expand Up @@ -2511,7 +2499,7 @@ msgstr ""
msgid "bits must be 32 or less"
msgstr ""

#: shared-bindings/audiomixer/Mixer.c
#: shared-bindings/audiodelays/Echo.c shared-bindings/audiomixer/Mixer.c
msgid "bits_per_sample must be 8 or 16"
msgstr ""

Expand Down
5 changes: 4 additions & 1 deletion ports/raspberrypi/mpconfigport.mk
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ CIRCUITPY_PWMIO ?= 1
CIRCUITPY_RGBMATRIX ?= $(CIRCUITPY_DISPLAYIO)
CIRCUITPY_ROTARYIO ?= 1
CIRCUITPY_ROTARYIO_SOFTENCODER = 1
CIRCUITPY_SYNTHIO_MAX_CHANNELS = 12
CIRCUITPY_SYNTHIO_MAX_CHANNELS = 24
CIRCUITPY_USB_HOST ?= 1
CIRCUITPY_USB_VIDEO ?= 1

Expand Down Expand Up @@ -64,6 +64,9 @@ CIRCUITPY_PICODVI ?= 1
# Our generic touchio uses a pull down and RP2350 A2 hardware doesn't work correctly.
# So, turn touchio off because it doesn't work.
CIRCUITPY_TOUCHIO = 0

# Audio effects
CIRCUITPY_AUDIOEFFECTS ?= 1
endif

INTERNAL_LIBM = 1
Expand Down
5 changes: 5 additions & 0 deletions py/circuitpy_defns.mk
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,9 @@ endif
ifeq ($(CIRCUITPY_AUDIOCORE),1)
SRC_PATTERNS += audiocore/%
endif
ifeq ($(CIRCUITPY_AUDIODELAYS),1)
SRC_PATTERNS += audiodelays/%
endif
ifeq ($(CIRCUITPY_AUDIOMIXER),1)
SRC_PATTERNS += audiomixer/%
endif
Expand Down Expand Up @@ -617,6 +620,8 @@ SRC_SHARED_MODULE_ALL = \
audiocore/RawSample.c \
audiocore/WaveFile.c \
audiocore/__init__.c \
audiodelays/Echo.c \
audiodelays/__init__.c \
audioio/__init__.c \
audiomixer/Mixer.c \
audiomixer/MixerVoice.c \
Expand Down
4 changes: 4 additions & 0 deletions py/circuitpy_mpconfig.mk
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,10 @@ CFLAGS += -DCIRCUITPY_AUDIOCORE_DEBUG=$(CIRCUITPY_AUDIOCORE_DEBUG)
CIRCUITPY_AUDIOMP3 ?= $(call enable-if-all,$(CIRCUITPY_FULL_BUILD) $(CIRCUITPY_AUDIOCORE))
CFLAGS += -DCIRCUITPY_AUDIOMP3=$(CIRCUITPY_AUDIOMP3)

CIRCUITPY_AUDIOEFFECTS ?= 0
CIRCUITPY_AUDIODELAYS ?= $(CIRCUITPY_AUDIOEFFECTS)
CFLAGS += -DCIRCUITPY_AUDIODELAYS=$(CIRCUITPY_AUDIODELAYS)

CIRCUITPY_AURORA_EPAPER ?= 0
CFLAGS += -DCIRCUITPY_AURORA_EPAPER=$(CIRCUITPY_AURORA_EPAPER)

Expand Down
Loading
Loading