bass: load plugins if they exist

Author: RaphaelIT7

source/detours.h

@@ -105,6 +105,8 @@ namespace Detour
 	}
 
 #ifdef SYSTEM_LINUX
+#define DLL_PREEXTENSION "lib"
+#define LIBRARY_EXTENSION ".so"
 #if ARCHITECTURE_IS_X86
 #define DLL_EXTENSION "_srv.so"
 #define DETOUR_SYMBOL_ID 0
@@ -113,7 +115,9 @@ namespace Detour
 #define DETOUR_SYMBOL_ID 1
 #endif
 #else
+#define DLL_PREEXTENSION ""
 #define DLL_EXTENSION ".dll"
+#define LIBRARY_EXTENSION ".dll"
 #if ARCHITECTURE_IS_X86
 #define DETOUR_SYMBOL_ID 2
 #else

source/modules/bass.cpp

@@ -426,6 +426,10 @@ void CBassModule::Init(CreateInterfaceFn* appfn, CreateInterfaceFn* gamefn)
 
 	gGModAudio = g_pGModAudio;
 	gGModAudio->Init(*appfn);
+	gGModAudio->LoadPlugin("bassenc");
+	gGModAudio->LoadPlugin("bassenc_opus");
+	gGModAudio->LoadPlugin("bassenc_mp3");
+	gGModAudio->LoadPlugin("bassenc_ogg");
 	// Always use our own Interface to not create funnies with the engine.
 }
 

source/sourcesdk/IGmod_Audio.h

@@ -96,6 +96,7 @@ abstract_class IGMod_Audio
 	virtual const char* GetErrorString( int ) = 0;
 	// HolyLib specific ones
 	virtual unsigned long GetVersion() = 0; // Returns bass version
+	virtual bool LoadPlugin(const char* pluginName) = 0;
 };
 
 #undef CALLBACK // Solves another error with minwindef.h

source/sourcesdk/cgmod_audio.cpp

@@ -7,10 +7,14 @@
 #include <tier2/tier2.h>
 #include <filesystem.h>
 #include "Platform.hpp"
+#include <detours.h>
 
 // memdbgon must be the last include file in a .cpp file!!!
 #include "tier0/memdbgon.h"
 
+// Set on interface init allowing us to possibly use newer features if available
+static bool g_bUsesLatestBass = false;
+
 const char* g_BASSErrorStrings[] = {
 	"BASS_OK",
 	"BASS_ERROR_MEM",
@@ -206,7 +210,6 @@ CGMod_Audio::~CGMod_Audio()
 
 }
 
-static bool g_bUsesLatestBass = false;
 bool CGMod_Audio::Init(CreateInterfaceFn interfaceFactory)
 {
 	ConnectTier1Libraries( &interfaceFactory, 1 );
@@ -452,6 +455,41 @@ IGModAudioChannel* CGMod_Audio::PlayFile(const char* filePath, const char* flags
 	return (IGModAudioChannel*)new CGModAudioChannel(stream, true, filePath);
 }
 
+bool CGMod_Audio::LoadPlugin(const char* pluginName)
+{
+	if (m_pLoadedPlugins.find(pluginName) != m_pLoadedPlugins.end())
+		return true;
+
+	char pLibraryFolder[MAX_PATH];
+	g_pFullFileSystem->RelativePathToFullPath("bin/", "BASE_PATH", pLibraryFolder, sizeof(pLibraryFolder));
+	
+	Msg("Bass Path: %s\n", (const char*)BASS_GetConfigPtr(BASS_CONFIG_FILENAME));
+	Msg("Base path: %s\n", pLibraryFolder);
+
+	std::string pPluginPath = pLibraryFolder;
+	pPluginPath.append(DLL_PREEXTENSION);
+	pPluginPath.append(pluginName);
+	pPluginPath.append(LIBRARY_EXTENSION);
+
+	HPLUGIN plugin = BASS_PluginLoad(pluginName, 0);
+	if (!plugin)
+	{
+		int nError = BASS_ErrorGetCode();
+		if (nError != BASS_ERROR_FILEOPEN) {
+			Warning(PROJECT_NAME " CGMod_Audio: Failed to load plugin %s (%s)\n", pluginName, g_BASSErrorStrings[nError]);
+		} else {
+			DevMsg(PROJECT_NAME " CGMod_Audio: Skipping plugin load %s since it was never installed\n", pluginName);
+		}
+
+		return false;
+	}
+
+	m_pLoadedPlugins[pluginName] = plugin;
+	DevMsg(PROJECT_NAME " CGMod_Audio: Successfully loaded plugin %s\n", pluginName);
+
+	return true;
+}
+
 EXPOSE_SINGLE_INTERFACE_GLOBALVAR(CGMod_Audio, IGMod_Audio, "IGModAudio001", g_CGMod_Audio);
 
 

source/sourcesdk/cgmod_audio.h

@@ -6,6 +6,7 @@
 #include "vaudio/ivaudio.h"
 #include "IGmod_Audio.h"
 #include "bass.h"
+#include <unordered_map>
 
 class CBassAudioStream : IBassAudioStream
 {
@@ -98,6 +99,9 @@ class CGMod_Audio : public IGMod_Audio
 	virtual const char* GetErrorString( int );
 	// HolyLib
 	virtual unsigned long GetVersion();
+	virtual bool LoadPlugin(const char* pluginName);
+private:
+	std::unordered_map<std::string, HPLUGIN> m_pLoadedPlugins;
 };
 
 extern const char* g_BASSErrorStrings[];