Rebase against d95780ba39816e3eb1139366236f3835564beadd.

patches/patchinstall.sh

@@ -51,7 +51,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "631f4d5e42b7c2f705eb4b40eeea0ce1866bf513"
+	echo "d95780ba39816e3eb1139366236f3835564beadd"
 }
 
 # Show version information
@@ -3934,7 +3934,6 @@ fi
 if test "$enable_xactengine3_7_callbacks" -eq 1; then
 	patch_apply xactengine3_7-callbacks/0001-Add-support-for-private-contexts.patch
 	patch_apply xactengine3_7-callbacks/0002-xactengine3_7-notifications.patch
-	patch_apply xactengine3_7-callbacks/0003-Send-NOTIFY_CUESTOP-when-Stop-is-called.patch
 	patch_apply xactengine3_7-callbacks/0004-xactengine3_7-Don-t-use-switch-with-constant-integer.patch
 fi
 

patches/xactengine3_7-callbacks/0003-Send-NOTIFY_CUESTOP-when-Stop-is-called.patch

@@ -1,25 +0,0 @@
-From a8f9265b71b423e2d280645a225465750a1d4594 Mon Sep 17 00:00:00 2001
-From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
-Date: Mon, 25 Oct 2021 09:48:50 +1100
-Subject: [PATCH 3/3] Send NOTIFY_CUESTOP when Stop is called
-
----
- libs/faudio/src/FACT.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/libs/faudio/src/FACT.c b/libs/faudio/src/FACT.c
-index cea960d6710..d9c5d7c2766 100644
---- a/libs/faudio/src/FACT.c
-+++ b/libs/faudio/src/FACT.c
-@@ -2685,6 +2685,8 @@ uint32_t FACTCue_Stop(FACTCue *pCue, uint32_t dwFlags)
- 		}
- 	}
- 
-+	FACT_INTERNAL_SendCueNotification(pCue, NOTIFY_CUESTOP, FACTNOTIFICATIONTYPE_CUESTOP);
-+
- 	FAudio_PlatformUnlockMutex(pCue->parentBank->parentEngine->apiLock);
- 	return 0;
- }
--- 
-2.33.0
-

staging/upstream-commit

@@ -1 +1 @@
-631f4d5e42b7c2f705eb4b40eeea0ce1866bf513
+d95780ba39816e3eb1139366236f3835564beadd