Skip to content

Commit fb8a4c4

Browse files
authored
Merge pull request #2842 from level-xx/Winwood_licence_fix_up
Updated license info for GPL synthdefs
2 parents f7a3c09 + 1b6cf29 commit fb8a4c4

File tree

2 files changed

+14
-4
lines changed

2 files changed

+14
-4
lines changed

LICENSE.md

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# License
22

33
## Main Source
4-
(contents of [app/](https://github.com/sonic-pi-net/sonic-pi/tree/main/app) and [etc/synthdefs/](https://github.com/sonic-pi-net/sonic-pi/tree/main/etc/synthdefs) directories)
4+
(contents of [app/](https://github.com/sonic-pi-net/sonic-pi/tree/main/app) directory)
55

66
The MIT License (MIT)
77

@@ -68,6 +68,16 @@ have been obtained from the
6868
[Adventure Kid](http://www.adventurekid.se/akrt/waveforms/adventure-kid-waveforms/)
6969
site.
7070

71+
## Synthdefs
72+
(contents of [etc/synthdefs/](https://github.com/sonic-pi-net/sonic-pi/tree/main/etc/synthdefs) directory)
73+
74+
The bundled synthdefs are licensed under the [MIT License](http://opensource.org/licenses/MIT) with the following exceptions, which are licensed under the [GNU General Public License v3](https://www.gnu.org/licenses/gpl-3.0.html):
75+
76+
* [etc/synthdefs/designs/supercollider/bass_foundation.scd](https://github.com/sonic-pi-net/sonic-pi/tree/main/etc/synthdefs/designs/supercollider/bass_foundation.scd)
77+
* [etc/synthdefs/designs/supercollider/bass_highend.scd](https://github.com/sonic-pi-net/sonic-pi/tree/main/etc/synthdefs/designs/supercollider/bass_highend.scd)
78+
* [etc/synthdefs/designs/supercollider/winwood_lead.scd](https://github.com/sonic-pi-net/sonic-pi/tree/main/etc/synthdefs/designs/supercollider/winwood_lead.scd)
79+
80+
See their source files for links to the original designs.
7181

7282
## Bundled Software
7383
The following is a list of the software included in Sonic Pi with their

app/server/ruby/lib/sonicpi/synths/synthinfo.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3308,7 +3308,7 @@ def on_start(studio, args_h)
33083308
end
33093309

33103310
def doc
3311-
"A lead synth inspired by the Winwood songs from the early 80s. Adapted for Sonic Pi from [Steal This Sound](https://raw.githubusercontent.com/supercollider/supercollider/develop/examples/demonstrations/stealthissound.scd). Published there under [GPL v3](https://www.gnu.org/licenses/gpl-3.0.en.html), so re-published under the same terms. The source code is available [on the Sonic Pi GitHub repository](https://github.com/sonic-pi-net/sonic-pi). Date of modification: 10.01.2021"
3311+
"A lead synth inspired by the Winwood songs from the early 80s. Adapted for Sonic Pi from [Steal This Sound](https://raw.githubusercontent.com/supercollider/supercollider/develop/examples/demonstrations/stealthissound.scd)."
33123312
end
33133313

33143314
def arg_defaults
@@ -3390,7 +3390,7 @@ def synth_name
33903390
end
33913391

33923392
def doc
3393-
"A soft bass synth inspired by the sounds of the 80s. Use together with :bass_highend if you want to give it a gargling component. Adapted for Sonic Pi from [Steal This Sound](https://raw.githubusercontent.com/supercollider/supercollider/develop/examples/demonstrations/stealthissound.scd). Published there under [GPL v3](https://www.gnu.org/licenses/gpl-3.0.en.html), so re-published under the same terms. The source code is available [on the Sonic Pi GitHub repository](https://github.com/sonic-pi-net/sonic-pi). Date of modification: 10.01.2021"
3393+
"A soft bass synth inspired by the sounds of the 80s. Use together with :bass_highend if you want to give it a gargling component. Adapted for Sonic Pi from [Steal This Sound](https://raw.githubusercontent.com/supercollider/supercollider/develop/examples/demonstrations/stealthissound.scd)."
33943394
end
33953395

33963396
def arg_defaults
@@ -3443,7 +3443,7 @@ def synth_name
34433443
end
34443444

34453445
def doc
3446-
"An addition to the :bass_foundation synth inspired by the sounds of the 80s. Use them together if you want to give it a rough, slurping, or gargling component. Adapted for Sonic Pi from [Steal This Sound](https://raw.githubusercontent.com/supercollider/supercollider/develop/examples/demonstrations/stealthissound.scd). Published there under [GPL v3](https://www.gnu.org/licenses/gpl-3.0.en.html), so re-published under the same terms. The source code is available [on the Sonic Pi GitHub repository](https://github.com/sonic-pi-net/sonic-pi). Date of modification: 11.01.2021"
3446+
"An addition to the :bass_foundation synth inspired by the sounds of the 80s. Use them together if you want to give it a rough, slurping, or gargling component. Adapted for Sonic Pi from [Steal This Sound](https://raw.githubusercontent.com/supercollider/supercollider/develop/examples/demonstrations/stealthissound.scd)."
34473447
end
34483448

34493449
def arg_defaults

0 commit comments

Comments
 (0)