fix: Update plugin for latest Amplitude updates.

na2axl · na2axl · commit 3f7bef201256 · 2024-12-10T14:01:13.000+01:00
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -68,11 +68,6 @@ jobs:
             archiver: "7z a"
             target_triplet: x64-windows
 
-          - name: "Windows Latest MinGW"
-            os: windows-latest
-            archiver: "7z a"
-            target_triplet: x64-mingw-static
-
           - name: "Ubuntu Latest GCC"
             os: ubuntu-latest
             archiver: "7z a"
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -16,14 +16,16 @@ cmake_minimum_required(VERSION 3.20)
 
 cmake_policy(SET CMP0048 NEW)
 
-if(EXISTS $ENV{AM_SDK_PATH})
+if (DEFINED AM_SDK_PATH)
+    list(APPEND CMAKE_MODULE_PATH "${AM_SDK_PATH}/cmake")
+    list(APPEND CMAKE_PREFIX_PATH "${AM_SDK_PATH}/cmake")
+endif()
+
+if(DEFINED ENV{AM_SDK_PATH})
     string(REPLACE "\\" "/" ENV_AM_SDK_PATH $ENV{AM_SDK_PATH})
     list(APPEND CMAKE_MODULE_PATH "${ENV_AM_SDK_PATH}/cmake")
     list(APPEND CMAKE_PREFIX_PATH "${ENV_AM_SDK_PATH}/cmake")
 endif()
-
-list(APPEND CMAKE_MODULE_PATH "${AM_SDK_PATH}/cmake")
-list(APPEND CMAKE_PREFIX_PATH "${AM_SDK_PATH}/cmake")
  
 project(AmplitudeFlacCodecPlugin)
 
diff --git a/Codec.cpp b/Codec.cpp
@@ -218,22 +218,22 @@ AmUInt64 FlacCodec::FlacEncoder::Write(AudioBuffer* in, AmUInt64 offset, AmUInt6
 
 Codec::Decoder* FlacCodec::CreateDecoder()
 {
-    return ampoolnew(MemoryPoolKind::Codec, FlacDecoder, this);
+    return ampoolnew(eMemoryPoolKind_Codec, FlacDecoder, this);
 }
 
 void FlacCodec::DestroyDecoder(Decoder* decoder)
 {
-    ampooldelete(MemoryPoolKind::Codec, FlacDecoder, (FlacDecoder*)decoder);
+    ampooldelete(eMemoryPoolKind_Codec, FlacDecoder, (FlacDecoder*)decoder);
 }
 
 Codec::Encoder* FlacCodec::CreateEncoder()
 {
-    return ampoolnew(MemoryPoolKind::Codec, FlacEncoder, this);
+    return ampoolnew(eMemoryPoolKind_Codec, FlacEncoder, this);
 }
 
 void FlacCodec::DestroyEncoder(Encoder* encoder)
 {
-    ampooldelete(MemoryPoolKind::Codec, FlacEncoder, (FlacEncoder*)encoder);
+    ampooldelete(eMemoryPoolKind_Codec, FlacEncoder, (FlacEncoder*)encoder);
 }
 
 bool FlacCodec::CanHandleFile(std::shared_ptr<File> file) const
diff --git a/Plugin.cpp b/Plugin.cpp
@@ -55,14 +55,14 @@ AM_API_PLUGIN bool RegisterPlugin(Engine* engine, MemoryManager* memoryManager)
     s_engine = engine;
     s_memoryManager = memoryManager;
 
-    s_flacCodec = ampoolnew(MemoryPoolKind::Engine, FlacCodec);
+    s_flacCodec = ampoolnew(eMemoryPoolKind_Engine, FlacCodec);
 
     return true;
 }
 
 AM_API_PLUGIN bool UnregisterPlugin()
 {
-    ampooldelete(MemoryPoolKind::Engine, FlacCodec, s_flacCodec);
+    ampooldelete(eMemoryPoolKind_Engine, FlacCodec, s_flacCodec);
     s_flacCodec = nullptr;
 
     s_engine = nullptr;
diff --git a/vcpkg.json b/vcpkg.json
@@ -1,5 +1,4 @@
 {
-  "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/master/docs/vcpkg.schema.json",
   "builtin-baseline": "7adc2e4d49e8d0efc07a369079faa6bc3dbb90f3",
   "name": "amplitude-plugin-codec-flac",
   "description": "Amplitude plugin to encode and decode FLAC audio files.",

Original file line number	Diff line number	Diff line change
`@@ -218,22 +218,22 @@ AmUInt64 FlacCodec::FlacEncoder::Write(AudioBuffer* in, AmUInt64 offset, AmUInt6`
`218`	`218`
`219`	`219`	`Codec::Decoder* FlacCodec::CreateDecoder()`
`220`	`220`	`{`
`221`		`- return ampoolnew(MemoryPoolKind::Codec, FlacDecoder, this);`
	`221`	`+ return ampoolnew(eMemoryPoolKind_Codec, FlacDecoder, this);`
`222`	`222`	`}`
`223`	`223`
`224`	`224`	`void FlacCodec::DestroyDecoder(Decoder* decoder)`
`225`	`225`	`{`
`226`		`- ampooldelete(MemoryPoolKind::Codec, FlacDecoder, (FlacDecoder*)decoder);`
	`226`	`+ ampooldelete(eMemoryPoolKind_Codec, FlacDecoder, (FlacDecoder*)decoder);`
`227`	`227`	`}`
`228`	`228`
`229`	`229`	`Codec::Encoder* FlacCodec::CreateEncoder()`
`230`	`230`	`{`
`231`		`- return ampoolnew(MemoryPoolKind::Codec, FlacEncoder, this);`
	`231`	`+ return ampoolnew(eMemoryPoolKind_Codec, FlacEncoder, this);`
`232`	`232`	`}`
`233`	`233`
`234`	`234`	`void FlacCodec::DestroyEncoder(Encoder* encoder)`
`235`	`235`	`{`
`236`		`- ampooldelete(MemoryPoolKind::Codec, FlacEncoder, (FlacEncoder*)encoder);`
	`236`	`+ ampooldelete(eMemoryPoolKind_Codec, FlacEncoder, (FlacEncoder*)encoder);`
`237`	`237`	`}`
`238`	`238`
`239`	`239`	`bool FlacCodec::CanHandleFile(std::shared_ptr<File> file) const`
Original file line number	Diff line number	Diff line change
`@@ -55,14 +55,14 @@ AM_API_PLUGIN bool RegisterPlugin(Engine* engine, MemoryManager* memoryManager)`
`55`	`55`	`s_engine = engine;`
`56`	`56`	`s_memoryManager = memoryManager;`
`57`	`57`
`58`		`- s_flacCodec = ampoolnew(MemoryPoolKind::Engine, FlacCodec);`
	`58`	`+ s_flacCodec = ampoolnew(eMemoryPoolKind_Engine, FlacCodec);`
`59`	`59`
`60`	`60`	`return true;`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`AM_API_PLUGIN bool UnregisterPlugin()`
`64`	`64`	`{`
`65`		`- ampooldelete(MemoryPoolKind::Engine, FlacCodec, s_flacCodec);`
	`65`	`+ ampooldelete(eMemoryPoolKind_Engine, FlacCodec, s_flacCodec);`
`66`	`66`	`s_flacCodec = nullptr;`
`67`	`67`
`68`	`68`	`s_engine = nullptr;`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`{`
`2`		`- "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/master/docs/vcpkg.schema.json",`
`3`	`2`	`"builtin-baseline": "7adc2e4d49e8d0efc07a369079faa6bc3dbb90f3",`
`4`	`3`	`"name": "amplitude-plugin-codec-flac",`
`5`	`4`	`"description": "Amplitude plugin to encode and decode FLAC audio files.",`