bass: extent it even more

Author: RaphaelIT7

source/lua.h

@@ -1022,6 +1022,12 @@ extern void Push_CBaseClient(GarrysMod::Lua::ILuaInterface* LUA, CBaseClient* tb
 extern CBaseClient* Get_CBaseClient(GarrysMod::Lua::ILuaInterface* LUA, int iStackPos, bool bError);
 #endif
 
+#if MODULE_EXISTS_VOICECHAT
+struct VoiceData;
+extern LuaUserData* Push_VoiceData(GarrysMod::Lua::ILuaInterface* LUA, VoiceData* tbl);
+extern VoiceData* Get_VoiceData(GarrysMod::Lua::ILuaInterface* LUA, int iStackPos, bool bError);
+#endif
+
 // NOTE: The angle itself is pushed, not a copy, any changes from lua will affect it!
 extern void Push_QAngle(GarrysMod::Lua::ILuaInterface* LUA, QAngle* var);
 

source/modules/bass.cpp

@@ -547,6 +547,63 @@ LUA_FUNCTION_STATIC(IGModAudioChannel_CreateEncoder)
 	return 2;
 }
 
+LUA_FUNCTION_STATIC(IGModAudioChannelEncoder_SetPaused)
+{
+	IGModAudioChannelEncoder* encoder = Get_IGModAudioChannelEncoder(LUA, 1, true);
+
+	encoder->SetPaused(LUA->GetBool(2));
+	return 0;
+}
+
+LUA_FUNCTION_STATIC(IGModAudioChannelEncoder_GetState)
+{
+	IGModAudioChannelEncoder* encoder = Get_IGModAudioChannelEncoder(LUA, 1, true);
+
+	LUA->PushNumber(encoder->GetState());
+	return 1;
+}
+
+LUA_FUNCTION_STATIC(IGModAudioChannelEncoder_SetChannel)
+{
+	IGModAudioChannelEncoder* encoder = Get_IGModAudioChannelEncoder(LUA, 1, true);
+	IGModAudioChannel* channel = Get_IGModAudioChannel(LUA, 2, true);
+
+	const char* pErrorCode = nullptr;
+	encoder->SetChannel(channel, &pErrorCode);
+	LUA->PushBool(pErrorCode == nullptr);
+	if (pErrorCode) {
+		LUA->PushString(pErrorCode);
+	} else {
+		LUA->PushNil();
+	}
+	return 2;
+}
+
+LUA_FUNCTION_STATIC(IGModAudioChannelEncoder_InsertVoiceData)
+{
+	IGModAudioChannelEncoder* encoder = Get_IGModAudioChannelEncoder(LUA, 1, true);
+
+#if MODULE_EXISTS_VOICECHAT
+	VoiceData* pVoiceData = Get_VoiceData(LUA, 2, true);
+	extern char* VoiceData_GetDecompressedData(VoiceData* pData, int* pLength); // exposed for us :3
+
+	int nLength = -1;
+	char* pRawData = VoiceData_GetDecompressedData(pVoiceData, &nLength);
+	if (!pRawData)
+	{
+		LUA->PushBool(false);
+		return 1;
+	}
+
+	encoder->WriteData(pRawData, nLength);
+#else
+	MISSING_MODULE_ERROR(LUA, voicechat);
+#endif
+
+	LUA->PushBool(true);
+	return 1;
+}
+
 LUA_FUNCTION_STATIC(bass_PlayFile)
 {
 	const char* filePath = LUA->CheckString(1);
@@ -614,6 +671,23 @@ LUA_FUNCTION_STATIC(bass_GetVersion)
 	return 1;
 }
 
+LUA_FUNCTION_STATIC(bass_CreateDummyChannel)
+{
+	int nSampleRate = LUA->CheckNumber(1);
+	int nChannels = LUA->CheckNumber(2);
+	unsigned long nFlags = (unsigned long)LUA->CheckNumber(3);
+
+	const char* pErrorCode = nullptr;
+	IGModAudioChannel* pChannel = gGModAudio->CreateDummyChannel(nSampleRate, nChannels, nFlags, &pErrorCode);
+	Push_IGModAudioChannel(LUA, pChannel);
+	if (pErrorCode) {
+		LUA->PushString(pErrorCode);
+	} else {
+		LUA->PushNil();
+	}
+	return 2;
+}
+
 LUA_FUNCTION_STATIC(bass_LoadPlugin)
 {
 	const char* pError = NULL;
@@ -666,6 +740,9 @@ void CBassModule::LuaInit(GarrysMod::Lua::ILuaInterface* pLua, bool bServerInit)
 		Util::AddFunc(pLua, IGModAudioChannelEncoder__index, "__index");
 		Util::AddFunc(pLua, IGModAudioChannelEncoder__newindex, "__newindex");
 		Util::AddFunc(pLua, IGModAudioChannelEncoder_MakeServer, "MakeServer");
+		Util::AddFunc(pLua, IGModAudioChannelEncoder_SetPaused, "SetPaused");
+		Util::AddFunc(pLua, IGModAudioChannelEncoder_GetState, "GetState");
+		Util::AddFunc(pLua, IGModAudioChannelEncoder_SetChannel, "SetChannel");
 	pLua->Pop(1);
 
 	Lua::GetLuaData(pLua)->RegisterMetaTable(Lua::IGModAudioChannel, pLua->CreateMetaTable("IGModAudioChannel"));
@@ -726,6 +803,7 @@ void CBassModule::LuaInit(GarrysMod::Lua::ILuaInterface* pLua, bool bServerInit)
 		Util::AddFunc(pLua, bass_PlayURL, "PlayURL");
 		Util::AddFunc(pLua, bass_Update, "Update");
 		Util::AddFunc(pLua, bass_GetVersion, "GetVersion");
+		Util::AddFunc(pLua, bass_CreateDummyChannel, "CreateDummyChannel");
 		// Util::AddFunc(pLua, bass_LoadPlugin, "LoadPlugin");
 	Util::FinishTable(pLua, "bass");
 }

source/modules/voicechat.cpp

@@ -302,6 +302,12 @@ struct VoiceData
 	char* pDecompressedData = nullptr;
 };
 
+// For other modules to utilize since we don't expose the struct. Looking at you bass
+char* VoiceData_GetDecompressedData(VoiceData* pData, int* pLength)
+{
+	return pData->GetDecompressedData(pLength);	
+}
+
 Push_LuaClass(VoiceData)
 Get_LuaClass(VoiceData, "VoiceData")
 

source/sourcesdk/IGmod_Audio.h

@@ -24,22 +24,36 @@ enum GModEncoderStatus {
 };
 
 // HolyLib specific
-// NOTE: Always call GetLastError after any function call to check for errors!
+// NOTE: Always call GetLastError after any function call that throws one to check for errors!
+class IGModAudioChannel;
 class IGModAudioChannelEncoder
 {
 public:
 	virtual ~IGModAudioChannelEncoder() {};
 
 	// ProcessNow uses BASS_ChannelGetData to pull data, so this function only works on decode channels!
+	// Will throw an error to check with GetLastError
 	virtual void ProcessNow(bool bUseAnotherThread) = 0;
+
 	virtual void Stop(bool bProcessQueue) = 0;
+
 	// Returns true if there was an error, pErrorOut will either be filled or NULL
 	// If it returns true, it will also invalidate/free itself so the pointer becomes invalid!
+	// NOTE: This is only for fatal errors like on init, most other functions have a pErrorOut argument for light errors that can be ignored
 	virtual bool GetLastError(const char** pErrorOut) = 0;
+
 	// Wasn't exposed since CreateEncoder already calls it so it has no real use
 	// virtual void InitEncoder(unsigned long nEncoderFlags) = 0;
 
 	virtual bool MakeServer( const char* port, unsigned long buffer, unsigned long burst, unsigned long flags, const char** pErrorOut ) = 0;
+
+	virtual void SetPaused( bool bPaused ) = 0;
+	virtual int GetState() = 0;
+
+	// virtual IGModAudioChannel* GetChannel() = 0;
+	virtual void SetChannel( IGModAudioChannel* pChannel, const char** pErrorOut ) = 0;
+
+	virtual void WriteData(const void* pData, unsigned long nLength) = 0;
 };
 
 class IGModAudioChannelEncoder;
@@ -141,6 +155,7 @@ abstract_class IGMod_Audio
 	virtual unsigned long GetVersion() = 0; // Returns bass version
 	virtual bool LoadPlugin(const char* pluginName, const char** pErrorOut) = 0;
 	virtual void FinishAllAsync(void* nSignalData) = 0; // Called on Lua shutdown to finish all callbacks/async tasks for that interface
+	virtual IGModAudioChannel* CreateDummyChannel(int nSampleRate, int nChannels, unsigned long nFlags, const char** pErrorOut) = 0;
 };
 
 #undef CALLBACK // Solves another error with minwindef.h

source/sourcesdk/cgmod_audio.cpp

@@ -257,6 +257,10 @@ static BASS_Encode_StopEx* func_BASS_Encode_StopEx;
 static BASS_Encode_SetNotify* func_BASS_Encode_SetNotify;
 static BASS_Encode_IsActive* func_BASS_Encode_IsActive;
 static BASS_Encode_ServerInit* func_BASS_Encode_ServerInit;
+static BASS_Encode_SetPaused* func_BASS_Encode_SetPaused;
+static BASS_Encode_GetChannel* func_BASS_Encode_GetChannel;
+static BASS_Encode_SetChannel* func_BASS_Encode_SetChannel;
+static BASS_Encode_Write* func_BASS_Encode_Write;
 
 static BASS_Encode_MP3_Start* func_BASS_Encode_MP3_Start;
 static BASS_Encode_OGG_Start* func_BASS_Encode_OGG_Start;
@@ -336,6 +340,10 @@ bool CGMod_Audio::Init(CreateInterfaceFn interfaceFactory)
 		GetBassEncFunc(BASS_Encode_SetNotify, pBassEnc);
 		GetBassEncFunc(BASS_Encode_IsActive, pBassEnc);
 		GetBassEncFunc(BASS_Encode_ServerInit, pBassEnc);
+		GetBassEncFunc(BASS_Encode_SetPaused, pBassEnc);
+		GetBassEncFunc(BASS_Encode_GetChannel, pBassEnc);
+		GetBassEncFunc(BASS_Encode_SetChannel, pBassEnc);
+		GetBassEncFunc(BASS_Encode_Write, pBassEnc);
 		g_bUsesBassEnc = true;
 	}
 
@@ -635,6 +643,18 @@ void CGMod_Audio::FinishAllAsync(void* nSignalData)
 	Msg("FinishAllAsync done\n");
 }
 
+IGModAudioChannel* CGMod_Audio::CreateDummyChannel(int nSampleRate, int nChannels, unsigned long nFlags, const char** pErrorOut)
+{
+	HSTREAM pStream = BASS_StreamCreate(nSampleRate, nChannels, nFlags, STREAMPROC_DUMMY, NULL);
+	if (!pStream)
+	{
+		*pErrorOut = BassErrorToString(BASS_ErrorGetCode());
+		return NULL;
+	}
+
+	return new CGModAudioChannel(pStream, true, "DUMMY");
+}
+
 // We gotta load some DLLs first as bass won't load shit itself when using BASS_PluginLoad >:(
 bool CGMod_Audio::LoadDLL(const char* pDLLName, void** pDLLHandle)
 {
@@ -844,7 +864,7 @@ void CGModAudioChannel::Get3DCone(int* innerAngle, int* outerAngle, float* outer
 
 int CGModAudioChannel::GetState()
 {
-	return BASS_ChannelIsActive(m_pHandle);
+	return BASS_ChannelIsActive(m_pHandle)-1; // Why -1? Because their all shifted by +1 so they do not match gmod's expected enums
 }
 
 void CGModAudioChannel::SetLooping(bool looping)
@@ -1246,4 +1266,32 @@ bool CGModAudioChannelEncoder::MakeServer( const char* port, unsigned long buffe
 	}
 
 	return true;
+}
+
+void CGModAudioChannelEncoder::SetPaused(bool bPaused)
+{
+	func_BASS_Encode_SetPaused( m_pEncoder, bPaused );
+}
+
+int CGModAudioChannelEncoder::GetState()
+{
+	return (int)func_BASS_Encode_IsActive( m_pEncoder );
+}
+
+/*IGModAudioChannel* CGModAudioChannelEncoder::GetChannel()
+{
+	return func_BASS_Encode_GetChannel( m_pEncoder );
+}*/
+
+void CGModAudioChannelEncoder::SetChannel(IGModAudioChannel* pChannel, const char** pErrorOut)
+{
+	*pErrorOut = NULL;
+
+	if (func_BASS_Encode_SetChannel( m_pEncoder, ((CGModAudioChannel*)pChannel)->m_pHandle ) == 0)
+		*pErrorOut = BassErrorToString(BASS_ErrorGetCode());
+}
+
+void CGModAudioChannelEncoder::WriteData(const void* pData, unsigned long nLength)
+{
+	func_BASS_Encode_Write( m_pEncoder, pData, nLength );
 }

source/sourcesdk/cgmod_audio.h

@@ -49,6 +49,14 @@ class CGModAudioChannelEncoder : public IGModAudioChannelEncoder
 	virtual bool GetLastError(const char** pErrorOut);
 	virtual bool MakeServer( const char* port, unsigned long buffer, unsigned long burst, unsigned long flags, const char** pErrorOut );
 
+	virtual void SetPaused( bool bPaused );
+	virtual int GetState();
+
+	// virtual IGModAudioChannel* GetChannel();
+	virtual void SetChannel( IGModAudioChannel* pChannel, const char** pErrorOut );
+
+	virtual void WriteData(const void* pData, unsigned long nLength);
+
 public: // Non virtual
 	CGModAudioChannelEncoder(DWORD pChannel, const char* pFileName, IGModEncoderCallback* pCallback );
 	void InitEncoder(unsigned long nEncoderFlags);
@@ -126,6 +134,8 @@ class CGModAudioChannel : public IGModAudioChannel
 
 	bool IsDecode();
 private:
+	friend class CGModAudioChannelEncoder;
+
 	DWORD m_pHandle;
 	bool m_bIsFile;
 	std::string m_strFileName = "NULL"; // GMOD doesn't have this - HolyLib specific
@@ -151,6 +161,7 @@ class CGMod_Audio : public IGMod_Audio
 	virtual bool LoadPlugin(const char* pluginName, const char** pErrorOut);
 
 	virtual void FinishAllAsync(void* nSignalData);
+	virtual IGModAudioChannel* CreateDummyChannel(int nSampleRate, int nChannels, unsigned long nFlags, const char** pErrorOut);
 
 public: // Non virtual holylib functions
 	void AddEncoder(CGModAudioChannelEncoder* pEncoder) {