bass: expose these two & move GetChannelCount

Author: RaphaelIT7

README.md

@@ -3545,6 +3545,9 @@ See https://www.un4seen.com/doc/#bass/BASS_ChannelGetData.html<br>
 > [!NOTE]
 > The nSize is limited to 64kb!
 
+#### number(channelCount|nil on failure), string(errMsg - nil) IGModAudioChannel:GetChannelCount()
+Returns the number of channels this channel has.<br>
+
 #### bool(success), string(errMsg - nil) IGModAudioChannel:SetFX(string fxName, number fxType, number priority, table fxParams)
 fxName - A unique name used for FX so that you can have multiple of the same fx type with unique names you assigned<br>
 
@@ -3599,6 +3602,9 @@ See https://www.un4seen.com/doc/#bassmix/BASS_Mixer_ChannelIsActive.html for mor
 Sets the channel's mixer matrix.
 See https://www.un4seen.com/doc/#bassmix/BASS_Mixer_ChannelIsActive.html for more details<br>
 
+#### number(channelCount|nil on failure), string(errMsg - nil) IGModAudioChannel:GetMixerChannelCount()
+Returns the number of channels the mixer channel that this channel is attached to has.<br>
+
 #### bool IGModAudioChannel:IsSplitter()
 Returns `true` if the channel was created using `bass.CreateSplitChannel`<br>
 

source/modules/bass.cpp

@@ -548,6 +548,23 @@ LUA_FUNCTION_STATIC(IGModAudioChannel_GetChannelData)
 	return 2;
 }
 
+LUA_FUNCTION_STATIC(IGModAudioChannel_GetChannelCount)
+{
+	IGModAudioChannel* channel = Get_IGModAudioChannel(LUA, 1, true);
+
+	const char* pError = nullptr;
+	int nChannelCount = channel->GetChannelCount(&pError);
+	if (pError)
+	{
+		LUA->PushNil();
+		LUA->PushString(pError);
+	} else {
+		LUA->PushNumber(nChannelCount);
+		LUA->PushNil();
+	}
+	return 2;
+}
+
 LUA_FUNCTION_STATIC(IGModAudioChannel_SetFX)
 {
 	IGModAudioChannel* channel = Get_IGModAudioChannel(LUA, 1, true);
@@ -895,6 +912,23 @@ LUA_FUNCTION_STATIC(IGModAudioChannel_SetMixerMatrix)
 	return 2;
 }
 
+LUA_FUNCTION_STATIC(IGModAudioChannel_GetMixerChannelCount)
+{
+	IGModAudioChannel* channel = Get_IGModAudioChannel(LUA, 1, true);
+
+	const char* pError = nullptr;
+	int nChannelCount = channel->GetMixerChannelCount(&pError);
+	if (pError)
+	{
+		LUA->PushNil();
+		LUA->PushString(pError);
+	} else {
+		LUA->PushNumber(nChannelCount);
+		LUA->PushNil();
+	}
+	return 2;
+}
+
 LUA_FUNCTION_STATIC(IGModAudioChannel_IsSplitter)
 {
 	IGModAudioChannel* channel = Get_IGModAudioChannel(LUA, 1, true);
@@ -1479,6 +1513,7 @@ void CBassModule::LuaInit(GarrysMod::Lua::ILuaInterface* pLua, bool bServerInit)
 		Util::AddFunc(pLua, IGModAudioChannel_GetAttribute, "GetAttribute");
 		Util::AddFunc(pLua, IGModAudioChannel_IsAttributeSliding, "IsAttributeSliding");
 		Util::AddFunc(pLua, IGModAudioChannel_GetChannelData, "GetChannelData");
+		Util::AddFunc(pLua, IGModAudioChannel_GetChannelCount, "GetChannelCount");
 
 		Util::AddFunc(pLua, IGModAudioChannel_SetFX, "SetFX");
 		Util::AddFunc(pLua, IGModAudioChannel_ResetFX, "ResetFX");
@@ -1495,6 +1530,7 @@ void CBassModule::LuaInit(GarrysMod::Lua::ILuaInterface* pLua, bool bServerInit)
 		Util::AddFunc(pLua, IGModAudioChannel_RemoveMixerChannel, "RemoveMixerChannel");
 		Util::AddFunc(pLua, IGModAudioChannel_GetMixerState, "GetMixerState");
 		Util::AddFunc(pLua, IGModAudioChannel_SetMixerMatrix, "SetMixerMatrix");
+		Util::AddFunc(pLua, IGModAudioChannel_GetMixerChannelCount, "GetMixerChannelCount");
 
 		Util::AddFunc(pLua, IGModAudioChannel_IsSplitter, "IsSplitter");
 		Util::AddFunc(pLua, IGModAudioChannel_ResetSplitStream, "ResetSplitStream");

source/sourcesdk/IGmod_Audio.h

@@ -156,6 +156,7 @@ class IGModAudioChannel
 	virtual float GetAttribute( unsigned long nAttribute, const char** pErrorOut ) = 0;
 	virtual bool IsAttributeSliding( unsigned long nAttribute ) = 0;
 	virtual unsigned long GetChannelData( void* pBuffer, unsigned long nLength ) = 0;
+	virtual int GetChannelCount(const char** pErrorOut) = 0;
 
 	// FX Stuff, formerly I wanted to expose the IGModAudioFX
 	// though I did not like the idea of having to manage yet another independent but linked object
@@ -177,7 +178,6 @@ class IGModAudioChannel
 	virtual void RemoveMixerChannel() = 0;
 	virtual int GetMixerState() = 0;
 	virtual const char* SetMatrix(float* pValues, float fTime) = 0;
-	virtual int GetChannelCount(const char** pErrorOut) = 0;
 	virtual int GetMixerChannelCount(const char** pErrorOut) = 0;
 
 	// Splitter functions

source/sourcesdk/cgmod_audio.cpp

@@ -1156,6 +1156,21 @@ unsigned long CGModAudioChannel::GetChannelData(void* pBuffer, unsigned long nLe
 	return BASS_ChannelGetData(m_pHandle, pBuffer, nLength);
 }
 
+
+int CGModAudioChannel::GetChannelCount(const char** pErrorOut)
+{
+	*pErrorOut = nullptr;
+
+	BASS_CHANNELINFO info;
+	if (!BASS_ChannelGetInfo(m_pHandle, &info))
+	{
+		*pErrorOut = BassErrorToString(BASS_ErrorGetCode());
+		return -1;
+	}
+
+	return info.chans;
+}
+
 bool CGModAudioChannel::SetFX( const char* pFXName, unsigned long nType, int nPriority, void* pParams, const char** pErrorOut )
 {
 	*pErrorOut = nullptr;
@@ -1267,30 +1282,25 @@ int CGModAudioChannel::GetMixerState()
 
 const char* CGModAudioChannel::SetMatrix(float* pValues, float fTime)
 {
+	if (!func_BASS_Mixer_ChannelSetMatrixEx)
+		return "Missing BassMix plugin!  (Install it manually!)";
+
 	if (!func_BASS_Mixer_ChannelSetMatrixEx(m_pHandle, pValues, fTime))
 		return BassErrorToString(BASS_ErrorGetCode());
 
 	return nullptr;
 }
 
-int CGModAudioChannel::GetChannelCount(const char** pErrorOut)
+int CGModAudioChannel::GetMixerChannelCount(const char** pErrorOut)
 {
 	*pErrorOut = nullptr;
 
-	BASS_CHANNELINFO info;
-	if (!BASS_ChannelGetInfo(m_pHandle, &info))
+	if (!func_BASS_Mixer_ChannelGetMixer)
 	{
-		*pErrorOut = BassErrorToString(BASS_ErrorGetCode());
+		*pErrorOut = "Missing BassMix plugin!  (Install it manually!)";
 		return -1;
 	}
 
-	return info.chans;
-}
-
-int CGModAudioChannel::GetMixerChannelCount(const char** pErrorOut)
-{
-	*pErrorOut = nullptr;
-
 	HSTREAM pMixer = func_BASS_Mixer_ChannelGetMixer(m_pHandle);
 	if (!pMixer)
 	{

source/sourcesdk/cgmod_audio.h

@@ -180,6 +180,7 @@ class CGModAudioChannel : public IGModAudioChannel
 	virtual float GetAttribute( unsigned long nAttribute, const char** pErrorOut );
 	virtual bool IsAttributeSliding( unsigned long nAttribute );
 	virtual unsigned long GetChannelData( void* pBuffer, unsigned long nLength );
+	virtual int GetChannelCount(const char** pErrorOut);
 
 	// FX
 	virtual bool SetFX( const char* pFXName, unsigned long nType, int nPriority, void* pParams, const char** pErrorOut );
@@ -200,7 +201,6 @@ class CGModAudioChannel : public IGModAudioChannel
 	virtual void RemoveMixerChannel();
 	virtual int GetMixerState();
 	virtual const char* SetMatrix(float* pValues, float fTime);
-	virtual int GetChannelCount(const char** pErrorOut);
 	virtual int GetMixerChannelCount(const char** pErrorOut);
 
 	// Splitter functions