Merge branch 'main' into miniaudio

shorepine · Aug 27, 2024 · 6cd5f77 · 6cd5f77
2 parents 42173a6 + 6d78c18
commit 6cd5f77
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -541,7 +541,7 @@ def play(sequence, # from partials.sequence
 
 ## PCM
 
-AMY comes with a set of 67 drum-like and instrument PCM samples to use as well, as they are normally hard to render with additive or FM synthesis. You can use the type `PCM` and patch numbers 0-66 to explore them. Their native pitch is used if you don't give a frequency or note parameter. You can update the PCM sample bank using `amy_headers.py`. 
+AMY comes with a set of 67 drum-like and instrument PCM samples to use as well, as they are normally hard to render with additive, subtractive or FM synthesis. You can use the type `PCM` and patch numbers 0-66 to explore them. Their native pitch is used if you don't give a frequency or note parameter. You can update the PCM sample bank using `amy_headers.py`. 
 
 
 ```python

diff --git a/library.properties b/library.properties
@@ -2,8 +2,8 @@ name=AMY Synthesizer
 version=1.0.0
 author=Brian Whitman <[email protected]>, DAn Ellis <[email protected]>
 maintainer=Brian Whitman <[email protected]>
-sentence=AMY, the Additive Music Synthesizer Library
-paragraph=AMY supports many types of oscillators, filters, envelopes, FM, PCM, Karplus-strong, reverb, chorus 
+sentence=AMY, the Music Synthesizer Library
+paragraph=AMY supports many types of oscillators, filters, envelopes, analog, FM, PCM, Karplus-strong, reverb, chorus 
 category=Signal Input/Output
 url=http://github.com/shorepine/amy
 architectures=esp32,stm32,rp2040,mbed_rp2040,teensy,STM32F1,STM32F4,nrf52,samd,avr
-Original file line number
+Diff line change
@@ Expand Up / @@ -541,7 +541,7 @@ def play(sequence, # from partials.sequence @@
     ## PCM
-    AMY comes with a set of 67 drum-like and instrument PCM samples to use as well, as they are normally hard to render with additive or FM synthesis. You can use the type `PCM` and patch numbers 0-66 to explore them. Their native pitch is used if you don't give a frequency or note parameter. You can update the PCM sample bank using `amy_headers.py`.
+    AMY comes with a set of 67 drum-like and instrument PCM samples to use as well, as they are normally hard to render with additive, subtractive or FM synthesis. You can use the type `PCM` and patch numbers 0-66 to explore them. Their native pitch is used if you don't give a frequency or note parameter. You can update the PCM sample bank using `amy_headers.py`.
     ```python
@@ Expand Down @@