@quenty/soundplayer 7.0.0 → 7.1.0-canary.453.b43d54e.0

package/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [7.1.0-canary.453.b43d54e.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/soundplayer@7.0.0...@quenty/soundplayer@7.1.0-canary.453.b43d54e.0) (2024-03-09)
+
+
+### Bug Fixes
+
+* Add suport for soundplayer ([b4fc6a5](https://github.com/Quenty/NevermoreEngine/commit/b4fc6a5d7cfc49eee49f82157a434197fdf1ba51))
+
+
+
+
+
 # [7.0.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/soundplayer@6.0.0...@quenty/soundplayer@7.0.0) (2024-02-14)
 
 **Note:** Version bump only for package @quenty/soundplayer

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quenty/soundplayer",
-  "version": "7.0.0",
+  "version": "7.1.0-canary.453.b43d54e.0",
   "description": "Sound playback helper",
   "keywords": [
     "Roblox",
@@ -25,28 +25,28 @@
     "Quenty"
   ],
   "dependencies": {
-    "@quenty/adorneeutils": "^3.1.0",
-    "@quenty/baseobject": "^10.0.0",
-    "@quenty/blend": "^12.0.0",
-    "@quenty/brio": "^14.0.0",
-    "@quenty/instanceutils": "^13.0.0",
-    "@quenty/loader": "^10.0.0",
-    "@quenty/maid": "^3.0.0",
-    "@quenty/numberrangeutils": "^3.0.0",
-    "@quenty/promise": "^10.0.0",
-    "@quenty/promisemaid": "^5.0.0",
-    "@quenty/randomutils": "^6.0.0",
-    "@quenty/rbxasset": "^5.0.0",
-    "@quenty/rx": "^13.0.0",
-    "@quenty/signal": "^7.0.0",
-    "@quenty/sounds": "^10.0.0",
-    "@quenty/table": "^3.4.0",
-    "@quenty/transitionmodel": "^7.0.0",
-    "@quenty/valueobject": "^13.0.0",
+    "@quenty/adorneeutils": "3.1.0",
+    "@quenty/baseobject": "10.1.0-canary.453.b43d54e.0",
+    "@quenty/blend": "12.1.0-canary.453.b43d54e.0",
+    "@quenty/brio": "14.1.0-canary.453.b43d54e.0",
+    "@quenty/instanceutils": "13.1.0-canary.453.b43d54e.0",
+    "@quenty/loader": "10.1.0-canary.453.b43d54e.0",
+    "@quenty/maid": "3.1.0-canary.453.b43d54e.0",
+    "@quenty/numberrangeutils": "3.0.0",
+    "@quenty/promise": "10.1.0-canary.453.b43d54e.0",
+    "@quenty/promisemaid": "5.1.0-canary.453.b43d54e.0",
+    "@quenty/randomutils": "6.1.0-canary.453.b43d54e.0",
+    "@quenty/rbxasset": "5.1.0-canary.453.b43d54e.0",
+    "@quenty/rx": "13.1.0-canary.453.b43d54e.0",
+    "@quenty/signal": "7.1.0-canary.453.b43d54e.0",
+    "@quenty/sounds": "10.1.0-canary.453.b43d54e.0",
+    "@quenty/table": "3.4.0",
+    "@quenty/transitionmodel": "7.1.0-canary.453.b43d54e.0",
+    "@quenty/valueobject": "13.1.0-canary.453.b43d54e.0",
     "@quentystudios/t": "^3.0.0"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "63f949a67b77d3edc98b358cace163da8c789e9f"
+  "gitHead": "b43d54ea4edccf33def7e8d60c97d9dbec694379"
 }

package/src/Client/Loops/Layered/LayeredLoopedSoundPlayer.lua

@@ -19,20 +19,13 @@ LayeredLoopedSoundPlayer.__index = LayeredLoopedSoundPlayer
 function LayeredLoopedSoundPlayer.new(soundParent)
 	local self = setmetatable(SpringTransitionModel.new(), LayeredLoopedSoundPlayer)
 
-	self._soundParent = ValueObject.new(nil)
-	self._maid:GiveTask(self._soundParent)
+	self._layerMaid = self._maid:Add(Maid.new())
 
-	self._bpm = ValueObject.new(nil)
-	self._maid:GiveTask(self._bpm)
-
-	self._defaultCrossFadeTime = ValueObject.new(0.5, "number")
-	self._maid:GiveTask(self._defaultCrossFadeTime)
-
-	self._layerMaid = Maid.new()
-	self._maid:GiveTask(self._layerMaid)
-
-	self._volumeMultiplier = ValueObject.new(1, "number")
-	self._maid:GiveTask(self._volumeMultiplier)
+	self._soundParent = self._maid:Add(ValueObject.new(nil))
+	self._soundGroup = self._maid:Add(ValueObject.new(nil))
+	self._bpm = self._maid:Add(ValueObject.new(nil))
+	self._defaultCrossFadeTime = self._maid:Add(ValueObject.new(0.5, "number"))
+	self._volumeMultiplier = self._maid:Add(ValueObject.new(1, "number"))
 
 	self._layers = {}
 
@@ -58,9 +51,15 @@ function LayeredLoopedSoundPlayer:SetBPM(bpm)
 end
 
 function LayeredLoopedSoundPlayer:SetSoundParent(soundParent)
+	assert(typeof(soundParent) == "Instance" or soundParent == nil, "Bad soundParent")
+
 	self._soundParent.Value = soundParent
 end
 
+function LayeredLoopedSoundPlayer:SetSoundGroup(soundGroup)
+	return self._soundGroup:Mount(soundGroup)
+end
+
 function LayeredLoopedSoundPlayer:Swap(layerId, soundId, scheduleOptions)
 	assert(type(layerId) == "string", 'Bad layerId')
 	assert(SoundUtils.isConvertableToRbxAsset(soundId) or soundId == nil, "Bad soundId")
@@ -119,9 +118,12 @@ function LayeredLoopedSoundPlayer:_getOrCreateLayer(layerId)
 
 	local maid = Maid.new()
 
-	local layer = LoopedSoundPlayer.new()
+	local layer = maid:Add(LoopedSoundPlayer.new())
 	layer:SetDoSyncSoundPlayback(true)
-	maid:GiveTask(layer)
+
+	maid:GiveTask(self._soundGroup:Observe():Subscribe(function(soundGroup)
+		layer:SetSoundGroup(soundGroup)
+	end))
 
 	maid:GiveTask(layer:SetCrossFadeTime(self._defaultCrossFadeTime:Observe()))
 

package/src/Client/Loops/LoopedSoundPlayer.lua

@@ -30,16 +30,14 @@ function LoopedSoundPlayer.new(soundId, soundParent)
 
 	local self = setmetatable(SpringTransitionModel.new(), LoopedSoundPlayer)
 
-	self._currentSoundLooped = Signal.new()
-	self._maid:GiveTask(self._currentSoundLooped)
-
-	self._currentSoundLoopedAfterDelay = Signal.new()
-	self._maid:GiveTask(self._currentSoundLoopedAfterDelay)
+	self._currentSoundLooped = self._maid:Add(Signal.new())
+	self._currentSoundLoopedAfterDelay = self._maid:Add(Signal.new())
 
 	self:SetSpeed(10)
 
 	self._bpm = self._maid:Add(ValueObject.new(nil))
 	self._soundParent = self._maid:Add(ValueObject.new(nil))
+	self._soundGroup = self._maid:Add(ValueObject.new(nil))
 	self._crossFadeTime = self._maid:Add(ValueObject.new(0.5, "number"))
 	self._volumeMultiplier = self._maid:Add(ValueObject.new(1, "number"))
 	self._doSyncSoundPlayback = self._maid:Add(ValueObject.new(false, "boolean"))
@@ -70,6 +68,10 @@ function LoopedSoundPlayer:SetVolumeMultiplier(volume)
 	self._volumeMultiplier.Value = volume
 end
 
+function LoopedSoundPlayer:SetSoundGroup(soundGroup)
+	return self._soundGroup:Mount(soundGroup)
+end
+
 function LoopedSoundPlayer:SetBPM(bpm)
 	assert(type(bpm) == "number" or bpm == nil, "Bad bpm")
 
@@ -118,9 +120,12 @@ function LoopedSoundPlayer:_renderSoundPlayer(soundId)
 	local maid = Maid.new()
 
 	local renderMaid = Maid.new()
-	local soundPlayer = SimpleLoopedSoundPlayer.new(soundId)
+	local soundPlayer = renderMaid:Add(SimpleLoopedSoundPlayer.new(soundId))
 	soundPlayer:SetTransitionTime(self._crossFadeTime)
-	renderMaid:GiveTask(soundPlayer)
+
+	renderMaid:GiveTask(self._soundGroup:Observe():Subscribe(function(soundGroup)
+		soundPlayer:SetSoundGroup(soundGroup)
+	end))
 
 	renderMaid:GiveTask(Rx.combineLatest({
 		bpm = self._bpm:Observe();

package/src/Client/Loops/LoopedSoundPlayer.story.lua

@@ -15,12 +15,11 @@ return function(target)
 
 	local ORIGINAL = nil --"rbxassetid://14477435416"
 
-	local loopedSoundPlayer = LoopedSoundPlayer.new(ORIGINAL, target)
+	local loopedSoundPlayer = maid:Add(LoopedSoundPlayer.new(ORIGINAL, target))
 	loopedSoundPlayer:SetDoSyncSoundPlayback(true)
 	loopedSoundPlayer:SetCrossFadeTime(2)
 	loopedSoundPlayer:SetVolumeMultiplier(0.25)
 	loopedSoundPlayer:SetSoundParent(target)
-	maid:GiveTask(loopedSoundPlayer)
 
 	local OPTIONS = {
 		"rbxassetid://14477453689";

package/src/Client/Loops/SimpleLoopedSoundPlayer.lua

@@ -18,15 +18,13 @@ SimpleLoopedSoundPlayer.__index = SimpleLoopedSoundPlayer
 function SimpleLoopedSoundPlayer.new(soundId)
 	local self = setmetatable(TimedTransitionModel.new(), SimpleLoopedSoundPlayer)
 
-	self.Sound = SoundUtils.createSoundFromId(soundId)
+	self.Sound = self._maid:Add(SoundUtils.createSoundFromId(soundId))
 	self.Sound.Looped = true
 	self.Sound.Archivable = false
-	self._maid:GiveTask(self.Sound)
 
 	self:SetTransitionTime(1)
 
-	self._volumeMultiplier = ValueObject.new(1, "number")
-	self._maid:GiveTask(self._volumeMultiplier)
+	self._volumeMultiplier = self._maid:Add(ValueObject.new(1, "number"))
 
 	self._maxVolume = self.Sound.Volume
 
@@ -46,6 +44,12 @@ function SimpleLoopedSoundPlayer.new(soundId)
 	return self
 end
 
+function SimpleLoopedSoundPlayer:SetSoundGroup(soundGroup)
+	assert(typeof(soundGroup) == "Instance" or soundGroup == nil, "Bad soundGroup")
+
+	self.Sound.SoundGroup = soundGroup
+end
+
 function SimpleLoopedSoundPlayer:SetVolumeMultiplier(volume)
 	self._volumeMultiplier.Value = volume
 end

package/src/Client/Loops/SimpleLoopedSoundPlayer.story.lua

@@ -11,9 +11,8 @@ local Blend = require("Blend")
 return function(target)
 	local maid = Maid.new()
 
-	local simpleLoopedSoundPlayer = SimpleLoopedSoundPlayer.new("rbxassetid://14477453689")
+	local simpleLoopedSoundPlayer = maid:Add(SimpleLoopedSoundPlayer.new("rbxassetid://14477453689"))
 	simpleLoopedSoundPlayer:SetTransitionTime(1)
-	maid:GiveTask(simpleLoopedSoundPlayer)
 
 	simpleLoopedSoundPlayer.Sound.Parent = target