fix: ghost voice buffer

Author: aIIison

src/Features/Demo/NetworkGhostPlayer.cpp

@@ -1059,18 +1059,16 @@ void NetworkManager::Treat(sf::Packet &packet, bool udp) {
 		// decompress.
 		EVoiceResult res = steam->SteamUser()->DecompressVoice(pVoiceData, pMsgVoiceData->GetDataLength(), pbUncompressedVoice, sizeof(pbUncompressedVoice), &numUncompressedBytes, sampleRate);
 
-		// continous stream for voice.
+		// continuous stream for voice.
 		static VoiceStream stream(sampleRate);
-		if (stream.getStatus() != sf::SoundSource::Status::Playing)
-			stream.play();
 
 		if (res == k_EVoiceResultOK && numUncompressedBytes > 0) {
 			// load from raw pcm data.
 			stream.pushSamples((const int16_t *)pbUncompressedVoice, numUncompressedBytes / sizeof(int16_t));
 
 			// account for ingame vol.
 			static auto vol = Variable("volume");
-			sf::Listener::setGlobalVolume(vol.GetFloat() * 10000.f);
+			stream.setVolume(vol.GetFloat() * 10000.f);
 
 			// proximity.
 			auto player = client->GetPlayer(GET_SLOT() + 1);
@@ -1087,6 +1085,9 @@ void NetworkManager::Treat(sf::Packet &packet, bool udp) {
 
 				stream.setPosition({ghost_pos.x, ghost_pos.z, ghost_pos.y});
 			}
+
+			if (stream.getStatus() != sf::SoundSource::Status::Playing)
+				stream.play();
 		}
 
 		break;

src/Features/Demo/NetworkGhostPlayer.hpp

@@ -41,14 +41,25 @@ class VoiceStream : public sf::SoundStream {
 		initialize(1, sampleRate, {sf::SoundChannel::Mono});
 	}
 
+	~VoiceStream() override {
+		stop();
+		{
+			std::unique_lock<std::mutex> lock(mutex);
+			stopRequested = true;
+		}
+		cv.notify_all();
+	}
+
 	bool onGetData(Chunk &data) override {
 		std::unique_lock<std::mutex> lock(mutex);
-		if (bufferQueue.empty()) {
-			return true;
-		}
+
+		cv.wait(lock, [&] { return !bufferQueue.empty() || stopRequested; });
+
+		if (stopRequested) return false;
 
 		currentBuffer = std::move(bufferQueue.front());
 		bufferQueue.pop();
+
 		data.samples = currentBuffer.data();
 		data.sampleCount = currentBuffer.size();
 		return true;
@@ -57,14 +68,20 @@ class VoiceStream : public sf::SoundStream {
 	void onSeek(sf::Time) override {}
 
 	void pushSamples(const int16_t *samples, std::size_t count) {
-		std::unique_lock<std::mutex> lock(mutex);
-		bufferQueue.emplace(samples, samples + count);
+		{
+			std::unique_lock<std::mutex> lock(mutex);
+			if (stopRequested) return;
+			bufferQueue.emplace(samples, samples + count);
+		}
+		cv.notify_one();
 	}
 
 private:
 	std::mutex mutex;
+	std::condition_variable cv;
 	std::queue<std::vector<int16_t>> bufferQueue;
 	std::vector<int16_t> currentBuffer;
+	bool stopRequested = false;
 };
 
 class NetworkManager {