Merge branch 'dev-5.5'

JujuAdams · Nov 20, 2023 · 9c2d042 · 9c2d042
2 parents 01e6758 + 5890434
commit 9c2d042
Show file tree

Hide file tree

Showing 12 changed files with 21 additions and 24 deletions.
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 <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 5.5.2</h1>
+<h1 align="center">Vinyl 5.5.3</h1>
 
 <p align="center">Modular audio system for GameMaker 2023.8 (and later)</p>
 

diff --git a/notes/TestConfig/TestConfig.txt b/notes/TestConfig/TestConfig.txt
@@ -64,14 +64,6 @@
             label: sfx
         }
 
-        sndBleep6: {
-            loop: true
-        }
-
-        sndBleep11: {
-            loop: true
-        }
-
         [sndSync0, sndSync1, sndSync2,  sndSync3]: {
             bpm: 75
         }

diff --git a/objects/oTest/Draw_0.gml b/objects/oTest/Draw_0.gml
@@ -175,7 +175,12 @@ UIButtonInline("Space cat", function()
     VinylPlay("space cat", false, 1, 1, random_range(-1, 1));
 });
 
-UIButtonInline("Bleep shuffle", function()
+UIButtonInline("Bleep shuffle (standard)", function()
+{
+    VinylPlay("bleep shuffle");
+});
+
+UIButtonInline("Bleep shuffle (simple)", function()
 {
     VinylPlaySimple("bleep shuffle");
 });

diff --git a/options/windows/options_windows.yy b/options/windows/options_windows.yy
diff --git a/scripts/VinylPlaySimple/VinylPlaySimple.gml b/scripts/VinylPlaySimple/VinylPlaySimple.gml
@@ -27,5 +27,5 @@ function VinylPlaySimple(_sound, _gain = 1, _pitch = 1)
         }
     }
 
-    return __VinylPatternGet(_sound).__PlaySimple(_sound, _gain, _pitch, undefined);
+    return __VinylPatternGet(_sound).__PlaySimple(_sound, _gain, _gain, _pitch, _pitch, undefined);
 }
diff --git a/scripts/__VinylClassPatternAsset/__VinylClassPatternAsset.gml b/scripts/__VinylClassPatternAsset/__VinylClassPatternAsset.gml
@@ -79,8 +79,8 @@ function __VinylClassPatternAsset(_name, _adHoc, _child, _asset) : __VinylClassP
         return _voice;
     }
 
-    static __PlaySimple = function(_sound_UNUSED, _gain = 1, _pitch = 1, _effectChainName = __effectChainName)
+    static __PlaySimple = function(_sound_UNUSED, _gainLo, _gainHi, _pitchLo, _pitchHi, _effectChainName = __effectChainName)
     {
-        return __VinylPlaySimple(__asset, _gain*__gainLo, _gain*__gainHi, _pitch*__pitchLo, _pitch*__pitchHi, __labelArray, _effectChainName);
+        return __VinylPlaySimple(__asset, _gainLo*__gainLo, _gainHi*__gainHi, _pitchLo*__pitchLo, _pitchHi*__pitchHi, __labelArray, _effectChainName);
     }
 }
diff --git a/scripts/__VinylClassPatternBasic/__VinylClassPatternBasic.gml b/scripts/__VinylClassPatternBasic/__VinylClassPatternBasic.gml
@@ -81,8 +81,8 @@ function __VinylClassPatternBasic(_name, _adHoc, _child) : __VinylClassPatternCo
         return _voice;
     }
 
-    static __PlaySimple = function(_sound_UNUSED, _gain = 1, _pitch = 1, _effectChainName = __effectChainName)
+    static __PlaySimple = function(_sound_UNUSED, _gainLo, _gainHi, _pitchLo, _pitchHi, _effectChainName = __effectChainName)
     {
-        return __VinylPatternGet(__asset).__PlaySimple(__asset, _gain*0.5*(__gainLo + __gainHi), _pitch*0.5*(__pitchLo + __pitchHi), _effectChainName); //TODO - Inherit properly
+        return __VinylPatternGet(__asset).__PlaySimple(__asset, _gainLo*__gainLo, _gainHi*__gainHi, _pitchLo*__pitchLo, _pitchHi*__pitchHi, _effectChainName);
     }
 }
diff --git a/scripts/__VinylClassPatternFallback/__VinylClassPatternFallback.gml b/scripts/__VinylClassPatternFallback/__VinylClassPatternFallback.gml
@@ -55,8 +55,8 @@ function __VinylClassPatternFallback() : __VinylClassPatternCommon() constructor
         return _voice;
     }
 
-    static __PlaySimple = function(_sound, _gain = 1, _pitch = 1, _effectChainName = __effectChainName)
+    static __PlaySimple = function(_sound, _gainLo, _gainHi, _pitchLo, _pitchHi, _effectChainName = __effectChainName)
     {
-        return __VinylPlaySimple(_sound, _gain*__gainLo, _gain*__gainHi, _pitch*__pitchLo, _pitch*__pitchHi, __labelArray, _effectChainName);
+        return __VinylPlaySimple(_sound, _gainLo*__gainLo, _gainHi*__gainHi, _pitchLo*__pitchLo, _pitchHi*__pitchHi, __labelArray, _effectChainName);
     }
 }
diff --git a/scripts/__VinylClassPatternMulti/__VinylClassPatternMulti.gml b/scripts/__VinylClassPatternMulti/__VinylClassPatternMulti.gml
@@ -94,7 +94,7 @@ function __VinylClassPatternMulti(_name, _adHoc, _child) : __VinylClassPatternCo
         return _voice;
     }
 
-    static __PlaySimple = function(_sound, _gain = 1, _pitch = 1, _effectChainName = __effectChainName)
+    static __PlaySimple = function()
     {
         __VinylError("Cannot use VinylPlaySimple() with a multi pattern");
     }

diff --git a/scripts/__VinylClassPatternQueue/__VinylClassPatternQueue.gml b/scripts/__VinylClassPatternQueue/__VinylClassPatternQueue.gml
@@ -67,7 +67,7 @@ function __VinylClassPatternQueue(_name, _adHoc, _child) : __VinylClassPatternCo
         return _voice;
     }
 
-    static __PlaySimple = function(_sound, _gain = 1, _pitch = 1, _effectChainName = __effectChainName)
+    static __PlaySimple = function()
     {
         __VinylError("Cannot use VinylPlaySimple() with a queue pattern");
     }

diff --git a/scripts/__VinylClassPatternShuffle/__VinylClassPatternShuffle.gml b/scripts/__VinylClassPatternShuffle/__VinylClassPatternShuffle.gml
@@ -87,9 +87,9 @@ function __VinylClassPatternShuffle(_name, _adHoc, _child) : __VinylClassPattern
         return _voice;
     }
 
-    static __PlaySimple = function(_sound_UNUSED, _gain = 1, _pitch = 1, _effectChainName = __effectChainName)
+    static __PlaySimple = function(_sound_UNUSED, _gainLo, _gainHi, _pitchLo, _pitchHi, _effectChainName = __effectChainName)
     {
         var _pattern = __PopPattern();
-        return __VinylPatternGet(_pattern).__PlaySimple(_pattern, _gain, _pitch, _effectChainName); //TODO - Inherit properly
+        return __VinylPatternGet(_pattern).__PlaySimple(_pattern, _gainLo*__gainLo, _gainHi*__gainHi, _pitchLo*__pitchLo, _pitchHi*__pitchHi, _effectChainName);
     }
 }
diff --git a/scripts/__VinylSystem/__VinylSystem.gml b/scripts/__VinylSystem/__VinylSystem.gml
@@ -1,6 +1,6 @@
 // Feather disable all
-#macro __VINYL_VERSION  "5.5.2"
-#macro __VINYL_DATE     "2023-11-14"
+#macro __VINYL_VERSION  "5.5.3"
+#macro __VINYL_DATE     "2023-11-20"
 
 #macro __VINYL_DATA_BUNDLE_FILENAME  "vinyl.dat"
 #macro __VINYL_CONFIG_NOTE_NAME      "__VinylConfig"
-Original file line number
+Diff line change
@@ Expand Up / @@ -27,5 +27,5 @@ function VinylPlaySimple(_sound, _gain = 1, _pitch = 1) @@
             }
         }
-        return __VinylPatternGet(_sound).__PlaySimple(_sound, _gain, _pitch, undefined);
+        return __VinylPatternGet(_sound).__PlaySimple(_sound, _gain, _gain, _pitch, _pitch, undefined);
     }