bass: try a mix of a previous unfucked version..

Author: RaphaelIT7

README.md

@@ -3327,6 +3327,11 @@ Valid encoders are:<br>
 > This function requires the `BASSENC` plugin to work at all!<br>
 > You can find all the plugins at https://www.un4seen.com/ drop them into the `bin/` folder besides `libbass.so`<br>
 
+> [!WARNING]
+> This function is a fucking gamble, I do not know why BASS decides this, though it behaves sometimes randomly.<br>
+> the current code for it seems to be somewhat stable, though any change like shifting it, adding arguments will cause issues<br>
+> until this is figured out this won't be changed in any way further (This could all point back to BASSENC itself having a bug specific to my usecase)<br>
+
 #### IGModAudioChannel:Update(number time)
 Updates the channel for the given time in seconds<br>
 See: https://www.un4seen.com/doc/#bass/BASS_ChannelUpdate.html<br>

source/modules/bass.cpp

@@ -334,58 +334,85 @@ LUA_FUNCTION_STATIC(IGModAudioChannel_Restart)
 	return 0;
 }
 
-class BassEncoderCallback : public IGModEncoderCallback
+
+
+class BassEncoderCallback : public IGModEncoderCallback, public GarrysMod::Lua::ILuaThreadedCall
 {
 public:
-	BassEncoderCallback(GarrysMod::Lua::ILuaInterface* pLua)
+	BassEncoderCallback(int nReference)
 	{
-		m_pLua = pLua;
-		m_nCallbackReference = Util::ReferenceCreate(pLua, "BassEncoderCallback - callback reference");
+		m_nCallbackReference = nReference;
 	}
 
 	virtual ~BassEncoderCallback() {
-		if (m_pLua && m_nCallbackReference != -1)
+		if (m_nCallbackReference != -1)
 		{
-			Util::ReferenceFree(m_pLua, m_nCallbackReference, "BassEncoderCallback - callback deletion");
+			Msg("BassEncoderCallback deleted while still holding a reference!\n");
 			m_nCallbackReference = -1;
-			m_pLua = NULL;
 		}
 	};
 
-	virtual bool ShouldFinish(IGModAudioChannelEncoder* pEncoder, void* nSignalData)
+	virtual bool ShouldForceFinish(IGModAudioChannelEncoder* pEncoder, void* nSignalData)
 	{
-		if (m_pLua == nSignalData)
-			return true; // Force finish as this is our signal that our interface is shutting down!
+		//if (m_pLua == nSignalData)
+		//	return true; // Force finish as this is our signal that our interface is shutting down!
 
 		return false;
 	};
 
 	virtual void OnFinish(IGModAudioChannelEncoder* pEncoder, GModEncoderStatus nStatus)
+	{
+		m_bIsBassDone = true;
+
+		if (m_bForceDelete)
+			delete this; // We serve no purpose... Lua is gone :NOOOOO:
+	};
+
+	bool IsDone()
+	{
+		return m_bIsBassDone;
+	}
+
+	void Done(GarrysMod::Lua::ILuaInterface* LUA)
 	{
 		if (m_nCallbackReference == -1)
 			return;
 
-		Util::ReferencePush(m_pLua, m_nCallbackReference);
-		if (nStatus == GModEncoderStatus::FINISHED)
-		{
-			m_pLua->PushBool(true);
-			m_pLua->PushNil();
+		Util::ReferencePush(LUA, m_nCallbackReference);
+		if (m_nBassStatus == GModEncoderStatus::FINISHED) {
+			LUA->PushBool(true);
+			LUA->PushNil();
 		} else {
-			m_pLua->PushBool(false);
-			m_pLua->PushString("Encoder was interrupted by Lua shutdown!");
+			LUA->PushBool(false);
+			LUA->PushString("Encoder was interrupted by Lua shutdown!");
 		}
-		m_pLua->CallFunctionProtected(2, 0, true);
+		LUA->CallFunctionProtected(2, 0, true);
 
-		Util::ReferenceFree(m_pLua, m_nCallbackReference, "BassEncoderCallback - callback deletion OnFinish");
+		Util::ReferenceFree(LUA, m_nCallbackReference, "BassEncoderCallback - callback deletion OnFinish");
 		m_nCallbackReference = -1;
-		m_pLua = NULL;
-	};
+	}
+
+	void OnShutdown()
+	{
+		m_nCallbackReference = -1;
+		if (!m_bIsBassDone)
+		{
+			// Bass still uses us, so we gotta delay this
+			m_bForceDelete = true;
+			return;
+		}
+
+		delete this;
+	}
 
 private:
-	GarrysMod::Lua::ILuaInterface* m_pLua = nullptr;
+	bool m_bIsBassDone = false;
+	bool m_bForceDelete = false;
 	int m_nCallbackReference = -1;
+	int m_nBassStatus = GModEncoderStatus::DIED;
 };
 
+#if ENABLE_UTTERLY_BROKEN_ENCODER_SHIT // https://github.com/RaphaelIT7/gmod-holylib/commit/48bc854f48aa26ec6539eabd01b66d87110b4598#diff-82711262b6e5109632243c62ed0ab8cba506cdf021817af4af807da268297bce
 LUA_FUNCTION_STATIC(IGModAudioChannel_EncodeToDisk)
 {
 	IGModAudioChannel* channel = Get_IGModAudioChannel(LUA, 1, true);
@@ -419,6 +446,7 @@ LUA_FUNCTION_STATIC(IGModAudioChannel_EncodeToDisk)
 	LUA->PushNil();
 	return 2;
 }
+#endif
 
 LUA_FUNCTION_STATIC(IGModAudioChannel_Update)
 {
@@ -460,23 +488,31 @@ LUA_FUNCTION_STATIC(IGModAudioChannel_DestroyLink)
 	return 2;
 }
 
-LUA_FUNCTION_STATIC(IGModAudioChannel_EncodeToDisk2)
+LUA_FUNCTION_STATIC(IGModAudioChannel_EncodeToDisk)
 {
 	IGModAudioChannel* channel = Get_IGModAudioChannel(LUA, 1, true);
 
 	const char* pFileName = LUA->CheckString(2);
 	unsigned long nFlags = (unsigned long)LUA->CheckString(3);
-	LUA->CheckType(4, GarrysMod::Lua::Type::Function);
 
-	const char* pErrorMsg;
-	channel->EncodeToDisk2(pFileName, nFlags, NULL, &pErrorMsg);
+	/*BassEncoderCallback* pCallback = nullptr;
+	if (LUA->IsType(4, GarrysMod::Lua::Type::Function))
+	{
+		LUA->Push(4);
+		pCallback = new BassEncoderCallback(Util::ReferenceCreate(LUA, "BassEncoderCallback - callback reference"));
+	}*/
+
+	const char* pErrorMsg = channel->EncodeToDisk(pFileName, nFlags/*, pCallback*/);
 	if (!pErrorMsg)
 	{ // Success
 		LUA->PushBool(true);
 		LUA->PushNil();
 		return 2;
 	}
 
+	// if (pCallback)
+	//	LUA->AddThreadedCall(pCallback);
+
 	LUA->PushBool(false);
 	LUA->PushString(pErrorMsg);
 	return 2;
@@ -642,7 +678,6 @@ void CBassModule::LuaInit(GarrysMod::Lua::ILuaInterface* pLua, bool bServerInit)
 
 		// HolyLib specific
 		Util::AddFunc(pLua, IGModAudioChannel_EncodeToDisk, "EncodeToDisk");
-		Util::AddFunc(pLua, IGModAudioChannel_EncodeToDisk2, "EncodeToDisk2");
 		Util::AddFunc(pLua, IGModAudioChannel_Update, "Update");
 		Util::AddFunc(pLua, IGModAudioChannel_CreateLink, "CreateLink");
 		Util::AddFunc(pLua, IGModAudioChannel_DestroyLink, "DestroyLink");
@@ -661,7 +696,9 @@ void CBassModule::LuaShutdown(GarrysMod::Lua::ILuaInterface* pLua)
 {
 	// Finish all callbacks
 	// We pass pLua so that our BassEncoderCallback can check if its their state and force a finish
+#if ENABLE_UTTERLY_BROKEN_ENCODER_SHIT
 	gGModAudio->FinishAllAsync(pLua);
+#endif
 
 	Util::NukeTable(pLua, "bass");
 }

source/plugin.cpp

@@ -356,7 +356,7 @@ void CServerPlugin::OnEdictFreed(const edict_t *edict)
 	g_pModuleManager.OnEdictFreed(edict);
 }
 
-class HolyLib_PluginThink : GarrysMod::Lua::ILuaThreadedCall
+class HolyLib_PluginThink : public GarrysMod::Lua::ILuaThreadedCall
 {
 public:
 	void SetLua(GarrysMod::Lua::ILuaInterface* pLua)
@@ -432,7 +432,7 @@ GMOD_MODULE_OPEN()
 	pPluginThink.SetLua(LUA);
 
 	// Add our Think hook.
-	LUA->AddThreadedCall((GarrysMod::Lua::ILuaThreadedCall*)&pPluginThink);
+	LUA->AddThreadedCall(&pPluginThink);
 
 	return 0;
 }

source/sourcesdk/IGmod_Audio.h

@@ -23,6 +23,7 @@ enum GModEncoderStatus {
 	DIED = 3,
 };
 
+#if ENABLE_UTTERLY_BROKEN_ENCODER_SHIT
 // HolyLib specific
 // NOTE: Always call GetLastError after any function call to check for errors!
 class IGModAudioChannelEncoder
@@ -39,13 +40,14 @@ class IGModAudioChannelEncoder
 	// Wasn't exposed since CreateEncoder already calls it so it has no real use
 	// virtual void InitEncoder(unsigned long nEncoderFlags) = 0;
 };
+#endif
 
 class IGModAudioChannelEncoder;
 class IGModEncoderCallback // Callback struct
 {
 public:
 	virtual ~IGModEncoderCallback() {};
-	virtual bool ShouldFinish(IGModAudioChannelEncoder* pEncoder, void* nSignalData) = 0;
+	virtual bool ShouldForceFinish(IGModAudioChannelEncoder* pEncoder, void* nSignalData) = 0;
 	virtual void OnFinish(IGModAudioChannelEncoder* pEncoder, GModEncoderStatus nStatus) = 0;
 };
 
@@ -93,8 +95,10 @@ class IGModAudioChannel
 	// Uses the "DATA" path for writes! Returns NULL on success, else the error message
 	// Does NOT require the channel to be a decoder channel!
 	// Call IGModAudioChannelEncoder->GetLastError and check if its even valid! (Else it will be invalidated/freed on the next tick)
-	virtual const char* EncodeToDisk2( const char* pFileName, unsigned long nFlags, IGModEncoderCallback* pCallback, const char** pErrorOut ) = 0;
+	virtual const char* EncodeToDisk( const char* pFileName, unsigned long nFlags ) = 0;
+#if ENABLE_UTTERLY_BROKEN_ENCODER_SHIT
 	virtual IGModAudioChannelEncoder* CreateEncoder( const char* pFileName, unsigned long nFlags, IGModEncoderCallback* pCallback, const char** pErrorOut ) = 0;
+#endif
 	virtual void Update( unsigned long length ) = 0; // Updates the playback buffer
 	virtual bool CreateLink( IGModAudioChannel* pChannel, const char** pErrorOut ) = 0;
 	virtual bool DestroyLink( IGModAudioChannel* pChannel, const char** pErrorOut ) = 0;
@@ -139,7 +143,9 @@ abstract_class IGMod_Audio
 	// HolyLib specific ones
 	virtual unsigned long GetVersion() = 0; // Returns bass version
 	virtual bool LoadPlugin(const char* pluginName, const char** pErrorOut) = 0;
+#if ENABLE_UTTERLY_BROKEN_ENCODER_SHIT
 	virtual void FinishAllAsync(void* nSignalData) = 0; // Called on Lua shutdown to finish all callbacks/async tasks for that interface
+#endif
 };
 
 #undef CALLBACK // Solves another error with minwindef.h