Merge branch 'dev-5'

.gitignore

@@ -1,3 +1,2 @@
 .DS_Store
-datafiles\vinyl.dat
-datafiles\vinyl.json
+datafiles/vinyl.dat

README.md

@@ -1,12 +1,26 @@
 <p align="center"><img src="https://raw.githubusercontent.com/JujuAdams/vinyl/master/LOGO.png" style="display:block; margin:auto; width:300px"></p>
-<h1 align="center">Vinyl 4.0.13</h1>
+<h1 align="center">Vinyl 5.0.20</h1>
 
-<p align="center">Live updating audio system for GameMaker LTS 2022 by <b>@jujuadams</b></p>
-
-&nbsp;
+<p align="center">Modular audio system for GameMaker 2023.2 (and later) by <b>@jujuadams</b></p>
 
 &nbsp;
 
 - ### [Download the .yymps](https://github.com/JujuAdams/Vinyl/releases/)
 - ### Read the [documentation](http://jujuadams.github.io/Vinyl)
 - ### Talk about Vinyl on the [Discord server](https://discord.gg/8krYCqr)
+
+&nbsp;
+
+## Features
+
+- Live reloading of [audio configuration](http://jujuadams.github.io/Vinyl/Configuration). You can mix whilst the game is running, no need for recompilation
+- In-built systems to handle common designs ([fade in](http://jujuadams.github.io/Vinyl/Playing-Audio), [callbacks on fade out](http://jujuadams.github.io/Vinyl/Stopping-Audio), [audio ducking](http://jujuadams.github.io/Vinyl/Stacks) etc.)
+- Multi-inheritance using Vinyl's ["labels"](http://jujuadams.github.io/Vinyl/Labels) (similar to audio groups)
+- Integral [shuffle](http://jujuadams.github.io/Vinyl/Shuffle-Patterns), [queue](http://jujuadams.github.io/Vinyl/Queue-Patterns), and [multi patterns](http://jujuadams.github.io/Vinyl/Multi-Patterns)
+- [Native panning](http://jujuadams.github.io/Vinyl/Positional)
+- Improved natural [gain curves](http://jujuadams.github.io/Vinyl/Gain)
+- [Pitch randomisation](http://jujuadams.github.io/Vinyl/Pitch) 
+- Out-of-the-box [BPM tracking](http://jujuadams.github.io/Vinyl/BPM) for audio
+- Improved [positional audio](http://jujuadams.github.io/Vinyl/Positional) via region emitters
+- [Musical transposition](http://jujuadams.github.io/Vinyl/Transposition) per asset and across all assets
+- System-wide parameter tweaking using ["knobs"](http://jujuadams.github.io/Vinyl/Knobs)

datafiles/vinyl.dat

@@ -1 +1 @@
-Ly8gUGxlYXNlIHNlZSBodHRwczovL2p1anVhZGFtcy5naXRodWIuaW8vVmlueWwgZm9yIGRvY3VtZW50YXRpb24NCg0KDQoNCnsNCiAgICBsYWJlbHM6IHsNCiAgICAgICAgbXVzaWM6IHsNCiAgICAgICAgICAgIGxvb3A6IHRydWUNCiAgICAgICAgICAgIGxpbWl0OiAxDQogICAgICAgIH0NCiAgICAgICAgYW1iaWVuY2U6IHsNCiAgICAgICAgICAgIGxvb3A6IHRydWUNCiAgICAgICAgICAgIGxpbWl0OiAxDQogICAgICAgIH0NCiAgICAgICAgbWVudToge30NCiAgICAgICAgZ2FtZXBsYXk6IHt9DQogICAgICAgIHNmeDogew0KICAgICAgICAgICAgY2hpbGRyZW46IHsNCiAgICAgICAgICAgICAgICBzcGVlY2g6IHsNCiAgICAgICAgICAgICAgICAgICAgcGl0Y2g6IFswLjksIDEuMV0NCiAgICAgICAgICAgICAgICB9DQogICAgICAgICAgICAgICAgZm9vdHN0ZXBzOiB7DQogICAgICAgICAgICAgICAgICAgIHBpdGNoOiBbMC44LCAxLjJdDQogICAgICAgICAgICAgICAgfQ0KICAgICAgICAgICAgICAgIHVpOiB7fQ0KICAgICAgICAgICAgfQ0KICAgICAgICB9DQogICAgfQ0KICAgIA0KICAgIA0KICAgIA0KICAgIGFzc2V0czogew0KICAgICAgICBmYWxsYmFjazoge30NCiAgICAgICAgc25kQ2hpY2tlbk51Z2dldHM6IHsNCiAgICAgICAgICAgIGxhYmVsOiBtdXNpYw0KICAgICAgICAgICAgY29weVRvOiBzbmRUZXN0VG9uZQ0KICAgICAgICB9DQogICAgfQ0KICAgIA0KICAgIA0KICAgIA0KICAgIHBhdHRlcm5zOiB7DQogICAgICAgIHJhbmRvbSBwaXRjaCB0ZXN0OiB7DQogICAgICAgICAgICBiYXNpYzogc25kVGVzdFRvbmUNCiAgICAgICAgICAgIHBpdGNoOiBbMC44LCAxLjJdDQogICAgICAgIH0NCiAgICAgICAgDQogICAgICAgIHNodWZmbGUgdGVzdDogew0KICAgICAgICAgICAgc2h1ZmZsZTogWw0KICAgICAgICAgICAgICAgIHNuZFRlc3RUb25lDQogICAgICAgICAgICAgICAgc25kQ2hpY2tlbk51Z2dldHMNCiAgICAgICAgICAgIF0NCiAgICAgICAgfQ0KICAgIH0NCn0=
+Ly8gUGxlYXNlIHNlZSBodHRwczovL2p1anVhZGFtcy5naXRodWIuaW8vVmlueWwgZm9yIGRvY3VtZW50YXRpb24NCg0Kew0KICAgIHN0YWNrczogew0KICAgICAgICANCiAgICB9DQogICAgDQogICAga25vYnM6IHsNCiAgICAgICAgDQogICAgfQ0KICAgIA0KICAgIGxhYmVsczogew0KICAgICAgICANCiAgICB9DQogICAgDQogICAgYXNzZXRzOiB7DQogICAgICAgIA0KICAgIH0NCiAgICANCiAgICBwYXR0ZXJuczogew0KICAgICAgICANCiAgICB9DQogICAgDQogICAgZWZmZWN0IGNoYWluczogew0KICAgICAgICANCiAgICB9DQp9

notes/TestConfig/TestConfig.txt

@@ -0,0 +1,133 @@
+//This is a test file
+// Please see https://jujuadams.github.io/Vinyl for documentation
+
+{
+    stacks: {
+        music: {}
+    }
+
+
+
+    knobs: {
+        delay time: {
+            output range: [0.3, 0.6]
+            default: 0.3 //This value is clamped inside the output range
+        }
+
+        //If we use just a number then that's the default value and we have no defined input or output ranges
+        reverb size: 0.2
+    }
+
+
+
+    labels: {
+        music: {
+            gain: 0.8
+            loop: true
+            stack: music
+            transpose: 0
+        }
+        sfx: {
+            children: {
+                speech: {
+                    pitch: [0.75, 1.25]
+                }
+                echo: {
+                    effect chain: echo
+                }
+            }
+        }
+    }
+
+
+
+    assets: {
+        sndChickenNuggets: {
+            label: music
+            loop point: [0.33, 2.81]
+        }
+
+        sndOw: {
+            label: [sfx, speech]
+        }
+
+        sndCat: {
+            label: sfx
+        }
+
+        [sndBleep0, sndBleep1,  sndBleep2,  sndBleep3,
+         sndBleep4, sndBleep5,  sndBleep6,  sndBleep7,
+         sndBleep8, sndBleep9, sndBleep10, sndBleep11]: {
+            label: sfx
+        }
+
+        [sndSync0, sndSync1, sndSync2,  sndSync3]: {
+            bpm: 75
+        }
+    }
+
+
+
+    patterns: {
+        space cat: {
+            type: basic
+            asset: sndCat
+            pitch: 0.75
+            effect chain: echo
+        }
+
+        bleep shuffle: {
+            type: shuffle
+            assets: [sndBleep0, sndBleep1,   sndBleep2,  sndBleep3,
+                     sndBleep4, sndBleep5,   sndBleep6,  sndBleep7,
+                     sndBleep8, sndBleep9,  sndBleep10, sndBleep11]
+        }
+
+        queue test: {
+            type: queue
+            assets: [
+                { asset: sndPop, transpose:  0 }
+                { asset: sndPop, transpose:  4 }
+                { asset: sndPop, transpose:  7 }
+                { asset: sndPop, transpose: 12 }
+                { asset: sndPop, transpose:  7 }
+                { asset: sndPop, transpose:  4 }
+                { asset: sndPop, transpose:  0 }
+            ]
+        }
+
+        music sync test: {
+            type: multi
+            label: [music, echo]
+            stack priority: 1
+            blend curve: acTest
+            blend: 0
+            pitch: 0.9
+            gain: 2
+            sync: true
+            assets: [
+                sndSync0
+                sndSync1
+                sndSync2
+                sndSync3
+            ]
+        }
+    }
+
+
+
+    effect chains: {
+        echo: [
+            {
+                type: delay
+                time: @delay time
+                mix: 0.4
+            }
+            {
+                type: reverb
+                size: @reverb size
+                mix: 0.3
+            }
+        ]
+    }
+}