From eed1beaba3569110b0e366816c24622b8216518a Mon Sep 17 00:00:00 2001
From: TwinFan <twinfan@sonux.net>
Date: Fri, 30 Jun 2023 23:05:46 +0200
Subject: [PATCH] Implemented XP12 Sound System

(FMOD system not yet re-integrated)
---
 CMakeLists.txt                         | 2 +-
 XPMP2-Sample.cpp                       | 4 ++--
 XPMP2-Sample.xcodeproj/project.pbxproj | 6 ++----
 lib/XPMP2                              | 2 +-
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 86a4041..4867bc3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -26,7 +26,7 @@ else()
 endif()
 
 project(XPMP2-Sample
-        VERSION 3.2.0
+        VERSION 3.3.0
         DESCRIPTION "XPMP2-Sample X-Plane plugin")
 
 message ("== Building: ${PROJECT_NAME} ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH} ==")
diff --git a/XPMP2-Sample.cpp b/XPMP2-Sample.cpp
index 8271c63..87f96a5 100644
--- a/XPMP2-Sample.cpp
+++ b/XPMP2-Sample.cpp
@@ -141,7 +141,7 @@ void CBPlaneNotifier(XPMPPlaneID            inPlaneID,
     }
 }
 
-#if defined(DEBUG) && defined(INCLUDE_FMOD_SOUND)
+#if defined(DEBUG) && (INCLUDE_FMOD_SOUND + 0 >= 1)
 /// Just for purposes of testing this functionality, we list all loaded sounds
 void DebugListLoadedSoundNames()
 {
@@ -1014,7 +1014,7 @@ PLUGIN_API int XPluginEnable(void)
         LogMsg("XPMP2-Sample: Error while loading CSL packages: %s", res);
     }
 
-#if defined(DEBUG) && defined(INCLUDE_FMOD_SOUND)
+#if defined(DEBUG) && (INCLUDE_FMOD_SOUND + 0 >= 1)
     // Just for purposes of testing this functionality, we list all loaded sounds
     // (This is likely not required in your plugin)
     DebugListLoadedSoundNames();
diff --git a/XPMP2-Sample.xcodeproj/project.pbxproj b/XPMP2-Sample.xcodeproj/project.pbxproj
index 920793d..6e77179 100644
--- a/XPMP2-Sample.xcodeproj/project.pbxproj
+++ b/XPMP2-Sample.xcodeproj/project.pbxproj
@@ -54,7 +54,6 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
-		254A0B792918533F004CA228 /* XPLM.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XPLM.framework; path = lib/SDK/Libraries/Mac/XPLM.framework; sourceTree = "<group>"; };
 		254A0B7B29185357004CA228 /* libfmod.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libfmod.dylib; path = lib/fmod/libfmod.dylib; sourceTree = "<group>"; };
 		254A0B7D291853CD004CA228 /* XPMP2.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = XPMP2.xcodeproj; path = lib/XPMP2/XPMP2.xcodeproj; sourceTree = "<group>"; };
 		2572C40523D88802006A7726 /* XPMP2-Sample.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "XPMP2-Sample.cpp"; sourceTree = "<group>"; };
@@ -120,7 +119,6 @@
 				25F4A2E62A3F9CF8002509C3 /* XPLM.framework */,
 				254A0B7D291853CD004CA228 /* XPMP2.xcodeproj */,
 				254A0B7B29185357004CA228 /* libfmod.dylib */,
-				254A0B792918533F004CA228 /* XPLM.framework */,
 				D6A7BDC016A1DEC000D1426A /* CoreFoundation.framework */,
 				D6A7BDA916A1DEA200D1426A /* OpenGL.framework */,
 			);
@@ -259,7 +257,7 @@
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
-					"INCLUDE_FMOD_SOUND=1",
+					"INCLUDE_FMOD_SOUND=0",
 					"APL=1",
 					"IBM=0",
 					"LIN=0",
@@ -363,7 +361,7 @@
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"NDEBUG=1",
-					"INCLUDE_FMOD_SOUND=1",
+					"INCLUDE_FMOD_SOUND=0",
 					"APL=1",
 					"IBM=0",
 					"LIN=0",
diff --git a/lib/XPMP2 b/lib/XPMP2
index fc6292b..62a3a6f 160000
--- a/lib/XPMP2
+++ b/lib/XPMP2
@@ -1 +1 @@
-Subproject commit fc6292bd57d595cacc174d3fd6ac94bc222b1be7
+Subproject commit 62a3a6fd5025ea218ff1a9bc22377071153fc447