From 14aa95f3cfdd3fa8d79f2c54bbf2c5f90ecbe6b7 Mon Sep 17 00:00:00 2001
From: Raphael Forment <raphael.forment@gmail.com>
Date: Sat, 24 Feb 2024 01:05:14 +0100
Subject: [PATCH] Fix: fixing some stuff before SAMP version upgrade

---
 Classes/Bank.sc     | 30 +++++++++++++++++++++++-------
 Classes/BuboBoot.sc | 20 +++++++++++---------
 2 files changed, 34 insertions(+), 16 deletions(-)

diff --git a/Classes/Bank.sc b/Classes/Bank.sc
index 1735023..a2da1b9 100644
--- a/Classes/Bank.sc
+++ b/Classes/Bank.sc
@@ -8,7 +8,7 @@ Bank : Singleton {
 	var <paths, buffers, <channels, <foundRoot, <foundRootModTime, markersCache, atCache;
 
 	*initClass {
-		root = "/Users/bubo/.config/livecoding/samples";
+		root = "/Users/bubo/.config/livecoding/samples".standardizePath;
 		extensions = ["wav", "aiff", "aif", "flac", "mp3"];
 	}
 
@@ -227,8 +227,15 @@ Bank : Singleton {
 		^this.at(index);
 	}
 
-	do 			{ |...args| buffers.size.collect(this.bufferAt(_)).do(*args) }
-	collect 	{ |...args| ^buffers.size.collect(this.bufferAt(_)).collect(*args) }
+	do {
+    |...args|
+    buffers.size.collect(this.bufferAt(_)).do(*args)
+  }
+
+	collect {
+    |...args|
+    ^buffers.size.collect(this.bufferAt(_)).collect(*args)
+  }
 
 	prUpdateBuffers {
 		if (Server.default.serverBooting or: {
@@ -284,10 +291,19 @@ Bank : Singleton {
 		^Pindex(Pseq([this], inf), keyPat)
 	}
 
-	// Single buffer support
-	asBuffer 		{ 				^this.singleSampleWrap(nil) }
-	asControlInput  { |...args| 	^this.prSingleSampleWrap(\asControlInput, *args) }
-	play 			{ |...args| 	^this.prSingleSampleWrap(\play, *args) }
+	asBuffer {
+    ^this.singleSampleWrap(nil)
+  }
+
+	asControlInput  {
+    |...args|
+    ^this.prSingleSampleWrap(\asControlInput, *args)
+  }
+
+	play {
+    |...args|
+    ^this.prSingleSampleWrap(\play, *args)
+  }
 
 	prSingleSampleWrap {
 		|method ...args|
diff --git a/Classes/BuboBoot.sc b/Classes/BuboBoot.sc
index b6932c0..233ad88 100644
--- a/Classes/BuboBoot.sc
+++ b/Classes/BuboBoot.sc
@@ -42,7 +42,7 @@ Boot {
     this.samplePath = samplePath ? "/Users/bubo/.config/livecoding/samples";
 
     // Setting up the audio samples/buffers manager
-    Bank.lazyLoading = true;
+    Bank.lazyLoading = false;
     Bank.root = this.samplePath;
 
     // Post actions: installing behavior after server boot
@@ -68,14 +68,16 @@ Boot {
       Event.addEventType(\buboEvent, {
       // This is a custom event that makes it easier to play samples
         arg server;
-        ~sp = ~sp ?? 'default';
-        ~nb = ~nb ?? 0;
-        ~buf = Bank(~sp)[~nb % Bank(~sp).paths.size];
-        if (~buf.numChannels == 1) {
-            ~instrument = \player;
-        } {
-            ~instrument = \splayer;
-        };
+        if (~sp.notNil && ~nb.notNil, {
+          ~sp = ~sp ?? 'default';
+          ~nb = ~nb ?? 0;
+          ~buf = Bank(~sp)[~nb % Bank(~sp).paths.size];
+          if (~buf.numChannels == 1) {
+              ~instrument = \player;
+          } {
+              ~instrument = \splayer;
+          };
+        });
         ~type = \note;
         currentEnvironment.play;
       });