decoder_control: add function _is_current_song()

Replaces _current_song().

1 files changed, 20 insertions, 14 deletions

diff --git a/src/decoder_control.h b/src/decoder_control.h
index 743c8fb58..7305e5813 100644
--- a/src/decoder_control.h
+++ b/src/decoder_control.h
@@ -276,21 +276,27 @@ decoder_lock_has_failed(struct decoder_control *dc)
 	return ret;
 }
 
-static inline const struct song *
-decoder_current_song(const struct decoder_control *dc)
-{
-	switch (dc->state) {
-	case DECODE_STATE_STOP:
-	case DECODE_STATE_ERROR:
-		return NULL;
-
-	case DECODE_STATE_START:
-	case DECODE_STATE_DECODE:
-		return dc->song;
-	}
+/**
+ * Check if the specified song is currently being decoded.  If the
+ * decoder is not running currently (or being started), then this
+ * function returns false in any case.
+ *
+ * Caller must lock the object.
+ */
+gcc_pure
+bool
+decoder_is_current_song(const struct decoder_control *dc,
+			const struct song *song);
 
-	assert(false);
-	return NULL;
+gcc_pure
+static inline bool
+decoder_lock_is_current_song(struct decoder_control *dc,
+			     const struct song *song)
+{
+	decoder_lock(dc);
+	const bool result = decoder_is_current_song(dc, song);
+	decoder_unlock(dc);
+	return result;
 }
 
 /**