Skip to content

Commit

Permalink
Merge pull request #189 from shorepine/removeadditive
Browse files Browse the repository at this point in the history
removing remaining "additives"
  • Loading branch information
bwhitman authored Aug 26, 2024
2 parents 61fd888 + bfb7f04 commit 6d78c18
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff 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
4 changes: 2 additions & 2 deletions docs/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@
<body>
<div id="content">
<h2>AMY examples</h2>
<P>Try out a web version of <A href="https://github.com/shorepine/amy">AMY, the additive music synthesizer library</A>
<P>Try out a web version of <A href="https://github.com/shorepine/amy">AMY, music synthesizer library</A>
<P><b>Before trying anything</b>, click "start AMY" to run the AMY synthesizer. Use "reset voices" to reset all the voices to default.
<p>
<a id="startStop" href="javascript: startAudio()">start AMY</a>
Expand Down Expand Up @@ -370,7 +370,7 @@ <h2>AMY message creator</h2>
<P>Message: <input id="constructed" length=40/><a href="javascript:send(-1)">send message to AMY</a> <a href="javascript: reset()">reset voices</a>


<P>Powered by <A href="https://github.com/shorepine/amy">AMY - the additive music synthesizer library</A>. Thanks to <a href="https://github.com/elf-audio/cpp-to-webaudio-example">elf-audio/cpp-to-webaudio-example</a>.
<P>Powered by <A href="https://github.com/shorepine/amy">AMY - the music synthesizer library</A>. Thanks to <a href="https://github.com/elf-audio/cpp-to-webaudio-example">elf-audio/cpp-to-webaudio-example</a>.
</div>
</body>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
Expand Down
4 changes: 2 additions & 2 deletions library.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 6d78c18

Please sign in to comment.