From 02bb01b3daccfad0bb30745b4e7aa96a02d64492 Mon Sep 17 00:00:00 2001
From: stevenhowes <38082088+stevenhowes@users.noreply.github.com>
Date: Mon, 24 May 2021 21:14:43 +0100
Subject: [PATCH] Free memory from PCM samples between missions.

---
 !TheEsc/!RunImage,ff8 | Bin 23632 -> 23908 bytes
 !TheEsc/Makefile,fe1  |  10 ++++++++--
 !TheEsc/Tools,fe1     |   6 ++++++
 !TheEsc/c/CTheEscape  |   8 ++++++++
 !TheEsc/c/Sound       |  41 +++++++++++++++++++++++++++++++++++++++++
 5 files changed, 63 insertions(+), 2 deletions(-)

diff --git a/!TheEsc/!RunImage,ff8 b/!TheEsc/!RunImage,ff8
index e7566281d34bb60bf9a33d8ef339f8952c0f7384..ef852efefa9d70ec74d77a3d73792b2e6781999c 100644
GIT binary patch
delta 3227
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
NTni?7PFMVq{}=0CHH!cM

delta 3064
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
A8vp<R

diff --git a/!TheEsc/Makefile,fe1 b/!TheEsc/Makefile,fe1
index 23a0c83..349038d 100644
--- a/!TheEsc/Makefile,fe1
+++ b/!TheEsc/Makefile,fe1
@@ -52,8 +52,12 @@ o.Graphics:	c.Graphics
 o.Graphics:	C:h.swis
 o.Graphics:	C:h.kernel
 o.Graphics:	C:h.kernel
-o.Intro:	c.Intro
-o.Intro:	h.Graphics
+o.CTheEscape:	c.CTheEscape
+o.CTheEscape:	C:h.swis
+o.CTheEscape:	C:h.kernel
+o.CTheEscape:	C:h.kernel
+o.CTheEscape:	h.Sound
+o.CTheEscape:	h.Graphics
 o.CTheEscape:	c.CTheEscape
 o.CTheEscape:	C:h.swis
 o.CTheEscape:	C:h.kernel
@@ -65,6 +69,8 @@ o.Sound:	C:h.swis
 o.Sound:	C:h.kernel
 o.Sound:	C:h.kernel
 o.Sound:	h.Sound
+o.Intro:	c.Intro
+o.Intro:	h.Graphics
 o.Mission1:	c.Mission1
 o.Mission1:	h.Graphics
 o.Mission1:	h.Sound
diff --git a/!TheEsc/Tools,fe1 b/!TheEsc/Tools,fe1
index 0052b8d..b835451 100644
--- a/!TheEsc/Tools,fe1
+++ b/!TheEsc/Tools,fe1
@@ -57,6 +57,12 @@ o.MapEdit:	C:h.kernel
 o.MapEdit:	C:h.kernel
 o.MapEdit:	h.Sound
 o.MapEdit:	h.Graphics
+o.MapEdit:	c.MapEdit
+o.MapEdit:	C:h.swis
+o.MapEdit:	C:h.kernel
+o.MapEdit:	C:h.kernel
+o.MapEdit:	h.Sound
+o.MapEdit:	h.Graphics
 o.Graphics:	c.Graphics
 o.Graphics:	C:h.swis
 o.Graphics:	C:h.kernel
diff --git a/!TheEsc/c/CTheEscape b/!TheEsc/c/CTheEscape
index f8222ef..7aa507b 100644
--- a/!TheEsc/c/CTheEscape
+++ b/!TheEsc/c/CTheEscape
@@ -72,6 +72,8 @@ int main(int argc, char *argv[])
   sound_set_voice(7,"DataVox-Voice");
   sound_set_voice(8,"DataVox-Voice");
 
+  sound_pcm_nullsamples();
+
   // Set initial display mode
   display_mode(DISPLAY_MODE);
   screen_clear();
@@ -92,6 +94,9 @@ int main(int argc, char *argv[])
   screen_clear();
 
 #ifndef SKIP_MISSION1
+  // Unload any audio samples we dont need
+  sound_pcm_clearsamples();
+
   // Mission 1
   while(lastoutcome == 1)
   {
@@ -109,6 +114,9 @@ int main(int argc, char *argv[])
 #endif
 
 #ifndef SKIP_MISSION2
+  // Unload any audio samples we dont need
+  sound_pcm_clearsamples();
+
   lastoutcome = 1;
 
   load_sprites("Tiles",&tilebuffer);
diff --git a/!TheEsc/c/Sound b/!TheEsc/c/Sound
index 5115650..c82587f 100644
--- a/!TheEsc/c/Sound
+++ b/!TheEsc/c/Sound
@@ -198,6 +198,30 @@ int sound_composition_incomplete()
     return 1;
 }
 
+void sound_pcm_nullsamples()
+{
+  int i;
+  for(i=0; i<PCMSAMPLE_MAX; i++)
+  {
+    pcmsamples[i].data = NULL;
+    pcmsamples[i].length = -1;
+  }
+}
+
+void sound_pcm_clearsamples()
+{
+  int i;
+  for(i = 0; i < PCMSAMPLE_MAX; i++)
+  {
+    if(pcmsamples[i].data)
+    {
+      free(pcmsamples[i].data);
+      pcmsamples[i].data = NULL;
+      pcmsamples[i].length = -1;
+    }
+  }
+}
+
 void sound_pcm_unset(enum pcmchannel_e channel)
 {
   inreg.r[0] = channel;
@@ -207,6 +231,13 @@ void sound_pcm_unset(enum pcmchannel_e channel)
 
 void sound_pcm_playsample(enum pcmchannel_e channel, enum pcmsample_e sample)
 {
+  if(!pcmsamples[sample].data)
+  {
+   screen_nobuffer();
+    while(1)
+      printf("PCM sample %d played without load\n",sample);
+  }
+
   inreg.r[0] = channel;
   inreg.r[1] = pcmsamples[sample].data;
   inreg.r[2] = pcmsamples[sample].data + pcmsamples[sample].length;
@@ -237,6 +268,13 @@ void sound_pcm_playsample(enum pcmchannel_e channel, enum pcmsample_e sample)
 
 void sound_pcm_playsample_ifidle(enum pcmchannel_e channel, enum pcmsample_e sample)
 {
+  if(!pcmsamples[sample].data)
+  {
+   screen_nobuffer();
+    while(1)
+      printf("PCM sample %d played without load\n",sample);
+  }
+
   inreg.r[0] = channel;
   _kernel_swi (DataVox_ReadAddress, &inreg, &outreg);
   if(!outreg.r[1])
@@ -247,6 +285,9 @@ void sound_pcm_loadsample(enum pcmsample_e sample, char* filename)
 {
   int length;
 
+  if(pcmsamples[sample].data)
+    return;
+
   // Attempt to get file info
   inreg.r[0] = 5;
   inreg.r[1] = (int) filename;