Merge pull request #78 from sirkrypt0/master

Added ability to customize sampling rate when loading new sound.
hpi-swa-teaching · Aug 30, 2021 · 90c1dfe · 90c1dfe
2 parents 533d976 + 0d751a2
commit 90c1dfe
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 20 deletions.
diff --git a/...M-Core.package/GMSoundLoader.class/instance/sampledSoundStringFromSound.withSamplesIn..st b/...M-Core.package/GMSoundLoader.class/instance/sampledSoundStringFromSound.withSamplesIn..st
diff --git a/...MSoundLoader.class/instance/sampledSoundStringFromSound.withSamplesIn.andSamplingRate..st b/...MSoundLoader.class/instance/sampledSoundStringFromSound.withSamplesIn.andSamplingRate..st
@@ -0,0 +1,9 @@
+storing
+sampledSoundStringFromSound: aSound withSamplesIn: aSelector andSamplingRate: aNumber
+	aSound setSamples: #[] samplingRate: aNumber.
+	^ (WriteStream on: '')
+		store: aSound;
+		nextPutAll: ' setSamples: (SoundBuffer fromByteArray: self ';
+		nextPutAll: aSelector asString;
+		nextPutAll: ') samplingRate: ', aNumber;
+		contents
diff --git a/...M-Core.package/GMSoundLoader.class/instance/storeResourceInMethod.inInstance.fromFile..st b/...M-Core.package/GMSoundLoader.class/instance/storeResourceInMethod.inInstance.fromFile..st
@@ -2,12 +2,4 @@ storing
 storeResourceInMethod: aSelector inInstance: anInstance fromFile: aFilename
 	"meta-programming warning
 	 only supports WAV, overwritten because we need multiple methods"
-	| sound |
-	sound := self resourceFromDrive: aFilename.
-	self compileMethod: (self samplesMethodName: aSelector)
-		inInstance: anInstance 
-		fromString: (self samplesStringFromSound: sound).
-	self compileMethod: aSelector 
-		inInstance: anInstance 
-		fromString: (self sampledSoundStringFromSound: sound 
-			withSamplesIn: (self samplesMethodName: aSelector)).
+	self storeResourceInMethod: aSelector inInstance: anInstance fromFile: aFilename withSamplingRate: 44100.
diff --git a/...SoundLoader.class/instance/storeResourceInMethod.inInstance.fromFile.withSamplingRate..st b/...SoundLoader.class/instance/storeResourceInMethod.inInstance.fromFile.withSamplingRate..st
@@ -0,0 +1,14 @@
+storing
+storeResourceInMethod: aSelector inInstance: anInstance fromFile: aFilename withSamplingRate: aNumber
+	"meta-programming warning
+	 only supports WAV, overwritten because we need multiple methods"
+	| sound |
+	sound := self resourceFromDrive: aFilename.
+	self compileMethod: (self samplesMethodName: aSelector)
+		inInstance: anInstance 
+		fromString: (self samplesStringFromSound: sound).
+	self compileMethod: aSelector 
+		inInstance: anInstance 
+		fromString: (self sampledSoundStringFromSound: sound 
+			withSamplesIn: (self samplesMethodName: aSelector)
+			andSamplingRate: aNumber).
diff --git a/source/GM-Core.package/GMSoundLoader.class/methodProperties.json b/source/GM-Core.package/GMSoundLoader.class/methodProperties.json
@@ -13,8 +13,9 @@
 		"playSound:" : "brh 7/3/2018 22:12",
 		"resourceFromDrive:" : "brh 7/14/2018 23:53",
 		"resumePlayingMusic" : "AZ 7/10/2018 16:02",
-		"sampledSoundStringFromSound:withSamplesIn:" : "brh 7/24/2018 20:37",
+		"sampledSoundStringFromSound:withSamplesIn:andSamplingRate:" : "tok 12/16/2019 14:21",
 		"samplesMethodName:" : "brh 7/24/2018 20:34",
 		"samplesStringFromSound:" : "brh 7/24/2018 20:30",
-		"storeResourceInMethod:inInstance:fromFile:" : "NK 7/25/2018 12:18",
+		"storeResourceInMethod:inInstance:fromFile:" : "tok 12/16/2019 14:21",
+		"storeResourceInMethod:inInstance:fromFile:withSamplingRate:" : "tok 12/16/2019 14:20",
 		"supportedTypes" : "brh 7/15/2018 14:20" } }