Fix BASS_StreamFree called twice for 3d audio streams. (#210)

* Fix BASS_StreamFree called twice for 3d audio streams. * Added BASS library version check.
cleolibrary · Sep 24, 2024 · 468e2d7 · 468e2d7
1 parent 7a262f1
commit 468e2d7
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/cleo_plugins/Audio/C3DAudioStream.cpp b/cleo_plugins/Audio/C3DAudioStream.cpp
@@ -27,11 +27,6 @@ C3DAudioStream::C3DAudioStream(const char* filepath) : CAudioStream()
     ok = true;
 }
 
-C3DAudioStream::~C3DAudioStream()
-{
-    if (streamInternal) BASS_StreamFree(streamInternal);
-}
-
 void C3DAudioStream::Set3dPosition(const CVector& pos)
 {
     link = nullptr;

diff --git a/cleo_plugins/Audio/C3DAudioStream.h b/cleo_plugins/Audio/C3DAudioStream.h
@@ -7,7 +7,6 @@ namespace CLEO
     {
     public:
         C3DAudioStream(const char* filepath);
-        virtual ~C3DAudioStream();
 
         // overloaded actions
         virtual void Set3dPosition(const CVector& pos);

diff --git a/cleo_plugins/Audio/CSoundSystem.cpp b/cleo_plugins/Audio/CSoundSystem.cpp
@@ -20,7 +20,6 @@ namespace CLEO
 
     void EnumerateBassDevices(int& total, int& enabled, int& default_device)
     {
-        TRACE(""); // separator
         TRACE("Listing audio devices:");
 
         BASS_DEVICEINFO info;
@@ -63,6 +62,16 @@ namespace CLEO
     {
         if (initialized) return true; // already done
 
+        TRACE(""); // separator
+        TRACE("Initializing SoundSystem...");
+
+        auto ver = HIWORD(BASS_GetVersion());
+        TRACE("BASS library version is %d (required %d or newer)", ver, BASSVERSION);
+        if (ver < BASSVERSION)
+        {
+            SHOW_ERROR("Invalid BASS library version! Expected at least %d, found %d.", BASSVERSION, ver);
+        }
+
         auto config = GetConfigFilename();
         LegacyModeDefaultStreamType = (eStreamType)GetPrivateProfileInt("General", "LegacyModeDefaultStreamType", 0, config.c_str());
         allowNetworkSources = GetPrivateProfileInt("General", "AllowNetworkSources", 1, config.c_str()) != 0;