replace id with optional read handler

include/rem_aumix.h

@@ -16,6 +16,7 @@ struct aumix_source;
  */
 typedef void (aumix_frame_h)(const int16_t *sampv, size_t sampc, void *arg);
 typedef void (aumix_record_h)(struct auframe *af);
+typedef void (aumix_read_h)(struct auframe *af, void *arg);
 
 int aumix_alloc(struct aumix **mixp, uint32_t srate,
 		uint8_t ch, uint32_t ptime);
@@ -29,5 +30,6 @@ void aumix_source_enable(struct aumix_source *src, bool enable);
 void aumix_source_mute(struct aumix_source *src, bool mute);
 int  aumix_source_put(struct aumix_source *src, const int16_t *sampv,
 		      size_t sampc);
+void aumix_source_readh(struct aumix_source *src, aumix_read_h *readh);
 void aumix_source_flush(struct aumix_source *src);
 int aumix_debug(struct re_printf *pf, struct aumix *mix);

src/aumix/aumix.c

@@ -37,12 +37,12 @@ struct aumix {
 /** Defines an Audio mixer source */
 struct aumix_source {
 	struct le le;
-	uint16_t id;
 	struct auframe af;
 	int16_t *frame;
 	struct aubuf *aubuf;
 	struct aumix *mix;
 	aumix_frame_h *fh;
+	aumix_read_h *readh;
 	void *arg;
 	bool muted;
 };
@@ -157,7 +157,10 @@ static int aumix_thread(void *arg)
 			if (src->muted)
 				continue;
 
-			aubuf_read_auframe(src->aubuf, &src->af);
+			if (src->readh)
+				src->readh(&src->af, src->arg);
+			else
+				aubuf_read_auframe(src->aubuf, &src->af);
 
 			if (mix->recordh)
 				mix->recordh(&src->af);
@@ -395,14 +398,19 @@ int aumix_source_alloc(struct aumix_source **srcp, struct aumix *mix,
 }
 
 
-void aumix_source_set_id(struct aumix_source *src, uint16_t id)
+/**
+ * Add source read handler (alternative to aumix_source_put)
+ *
+ * @param src    Audio mixer source
+ * @param readh  Read Handler
+ */
+void aumix_source_readh(struct aumix_source *src, aumix_read_h *readh)
 {
 	if (!src || !src->mix)
 		return;
 
 	mtx_lock(&src->mix->mutex);
-	src->id = id;
-	src->af.id = id;
+	src->readh = readh;
 	mtx_unlock(&src->mix->mutex);
 }