Skip to content

Commit ffbe740

Browse files
committed
Merge branch 'ricknjacky-timbre' into master
2 parents 5954e06 + 0ed462f commit ffbe740

File tree

14 files changed

+4810
-5807
lines changed

14 files changed

+4810
-5807
lines changed

guide/README.md

Lines changed: 3 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -2149,12 +2149,6 @@ The *Timbre* widget has a number of different panels, each of which is
21492149
used to set the parameters of the components that define your custom
21502150
timbre.
21512151

2152-
From left to right:
2153-
2154-
![alt
2155-
tag](https://rawgithub.com/sugarlabs/musicblocks/master/guide/timbre2a.svg
2156-
"the play button")
2157-
21582152
* The *Play* button, which lets you test the sound quality of your
21592153
custom timbre. By default, it will play `Sol`, `Mi`, `Sol` using the
21602154
combination of filters you define.
@@ -2166,10 +2160,6 @@ combination of filters you define.
21662160
You can also put notes in the *Timbre* block to use for testing your
21672161
sound. In the example above, a scale will be used for the test.
21682162

2169-
![alt
2170-
tag](https://rawgithub.com/sugarlabs/musicblocks/master/guide/timbre2b.svg
2171-
"the save button")
2172-
21732163
* The *Save* button, which will save your custom timbre for use in
21742164
your program.
21752165

@@ -2198,6 +2188,9 @@ envelope, with controls for attack, decay, sustain, and release.
21982188
![alt
21992189
tag](https://rawgithub.com/sugarlabs/musicblocks/master/guide/timbre6.svg
22002190
"select effect")
2191+
![alt
2192+
tag](https://rawgithub.com/sugarlabs/musicblocks/master/guide/timbre6a.svg
2193+
"tremolo")
22012194

22022195
* The *Effects* button, which lets you add effects to your custom
22032196
timbre: tremelo, vibrato, chorus, phaser, and distortion. When an
@@ -2210,31 +2203,11 @@ effect is selected, additional controls will appear in the widget.
22102203
* The *Filter* button, which lets you choose between a number of
22112204
different filter types.
22122205

2213-
![alt
2214-
tag](https://rawgithub.com/sugarlabs/musicblocks/master/guide/timbre2c.svg
2215-
"the add filter button")
2216-
22172206
* The *Add filter* button, which lets you add addition filters to your
22182207
custom timbre.
22192208

2220-
![alt
2221-
tag](https://rawgithub.com/sugarlabs/musicblocks/master/guide/timbre2d.svg
2222-
"the undo button")
2223-
22242209
* The *Undo* button.
22252210

2226-
![alt
2227-
tag](https://rawgithub.com/sugarlabs/musicblocks/master/guide/timbre2e.svg
2228-
"the close button")
2229-
2230-
* The *Close* button.
2231-
2232-
![alt
2233-
tag](https://rawgithub.com/sugarlabs/musicblocks/master/guide/timbre2f.svg
2234-
"the drag handle")
2235-
2236-
* The *Drag* handle.
2237-
22382211
As you add synthesizers, effects, and filters with the widget, blocks
22392212
corresponding to your choices are added to the *Timbre* block. This
22402213
lets you reopen the widget to fine-tune your custom timbre.

guide/timbre2.svg

Lines changed: 524 additions & 344 deletions
Loading

guide/timbre2a.svg

Lines changed: 0 additions & 485 deletions
This file was deleted.

guide/timbre2b.svg

Lines changed: 0 additions & 485 deletions
This file was deleted.

guide/timbre2c.svg

Lines changed: 0 additions & 485 deletions
This file was deleted.

guide/timbre2d.svg

Lines changed: 0 additions & 485 deletions
This file was deleted.

guide/timbre2e.svg

Lines changed: 0 additions & 485 deletions
This file was deleted.

guide/timbre2f.svg

Lines changed: 0 additions & 441 deletions
This file was deleted.

guide/timbre3.svg

Lines changed: 669 additions & 394 deletions
Loading

guide/timbre4.svg

Lines changed: 690 additions & 409 deletions
Loading

0 commit comments

Comments
 (0)