Add RemoveDecoderFromQueue (#565)

sbooth · Feb 1, 2025 · 71fa753 · 71fa753
1 parent eb8323e
commit 71fa753
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 0 deletions.
diff --git a/Sources/CSFBAudioEngine/Player/AudioPlayerNode.h b/Sources/CSFBAudioEngine/Player/AudioPlayerNode.h
@@ -186,6 +186,8 @@ class AudioPlayerNode final {
 	/// Pops the next decoder from the decoder queue
 	Decoder _Nullable DequeueDecoder() noexcept;
 
+	bool RemoveDecoderFromQueue(Decoder _Nonnull decoder) noexcept;
+
 	void ClearQueue() noexcept
 	{
 		std::lock_guard<SFB::UnfairLock> lock(mQueueLock);

diff --git a/Sources/CSFBAudioEngine/Player/AudioPlayerNode.mm b/Sources/CSFBAudioEngine/Player/AudioPlayerNode.mm
@@ -623,6 +623,20 @@ bool PerformSeekIfRequired() noexcept
 	return decoder;
 }
 
+bool SFB::AudioPlayerNode::RemoveDecoderFromQueue(Decoder decoder) noexcept
+{
+#if DEBUG
+	assert(decoder != nil);
+#endif /* DEBUG */
+
+	std::lock_guard<SFB::UnfairLock> lock(mQueueLock);
+	const auto iter = std::find(mQueuedDecoders.cbegin(), mQueuedDecoders.cend(), decoder);
+	if(iter == mQueuedDecoders.cend())
+		return false;
+	mQueuedDecoders.erase(iter);
+	return true;
+}
+
 SFB::AudioPlayerNode::Decoder SFB::AudioPlayerNode::CurrentDecoder() const noexcept
 {
 	std::lock_guard<SFB::UnfairLock> lock(mDecoderLock);

diff --git a/Sources/CSFBAudioEngine/Player/SFBAudioPlayerNode.mm b/Sources/CSFBAudioEngine/Player/SFBAudioPlayerNode.mm
@@ -130,6 +130,12 @@ - (BOOL)enqueueDecoder:(id <SFBPCMDecoding>)decoder error:(NSError **)error
 	return _impl->DequeueDecoder();
 }
 
+- (BOOL)removeDecoderFromQueue:(id<SFBPCMDecoding>)decoder
+{
+	NSParameterAssert(decoder != nil);
+	return _impl->RemoveDecoderFromQueue(decoder);
+}
+
 - (void)clearQueue
 {
 	_impl->ClearQueue();

diff --git a/Sources/CSFBAudioEngine/include/SFBAudioEngine/SFBAudioPlayerNode.h b/Sources/CSFBAudioEngine/include/SFBAudioEngine/SFBAudioPlayerNode.h
@@ -143,6 +143,10 @@ NS_SWIFT_NAME(AudioPlayerNode) @interface SFBAudioPlayerNode : AVAudioSourceNode
 /// Dequeues and returns the next decoder from the decoder queue
 - (nullable id <SFBPCMDecoding>) dequeueDecoder;
 
+/// Removes a decoder from the decoder queue
+/// - parameter decoder: The decoder to remove
+/// - returns: `YES` if the decoder was removed successfully
+- (BOOL)removeDecoderFromQueue:(id<SFBPCMDecoding>)decoder;
 /// Empties the decoder queue
 - (void)clearQueue;