ref

Author: stsaz

android/phiola/build.gradle

@@ -8,8 +8,8 @@ android {
 		applicationId "com.github.stsaz.phiola"
 		minSdkVersion 16
 		targetSdk 33
-		versionCode 20702
-		versionName '2.7-beta2'
+		versionCode 20703
+		versionName '2.7-beta3'
 	}
 
 	buildFeatures {

android/phiola/src/main/java/com/github/stsaz/phiola/Phiola.java

@@ -183,6 +183,7 @@ to the index within its parent (not filtered) list */
 		QC_AUTO_NORM = 0x10,
 		QC_RG_NORM = 0x20;
 	native void quConf(int mask, int val);
+
 	static final int
 		QC_EQUALIZER = 1;
 	native void quConfStr(int setting, String val);

doc/arch/arch.md

@@ -229,6 +229,51 @@ Example:
 	aac-decode:    decoded 2048 samples @2048  aot:29 rate:44100 chan:2 br:3789
 
 
+## Track Metadata
+
+* There are 3 metadata sources: user, .cue, media file.
+	User metadata may be set when converting or recording, and it has the highest priority (i.e. the values from .cue or media file are overwritten).
+* Queue-agent filter combines all metadata into one array; UI reads it to display the info on currently playing track; while converting, media-writer filter copies the unique entries from it into output file.
+* At any time UI thread may read or write the metadata associated with playlist rows.
+	Normally, this metadata is updated by queue-agent filter in a worker thread when the file is being played back (or a new logical stream begins); for CUE entries the metadata *is not* updated.
+
+```C
+user:
+q->conf.tconf.meta = ... <- e.g. `convert -m title=value`
+
+	-> cue.read
+	qe->meta = ...       <- e.g. `TITLE value`
+	qe->meta_priority = 1
+
+	-> q
+
+		-> fmt.read:
+		if (new stream)
+			t->meta = ... <- e.g. `title=value` from .opus
+			t->meta_changed = 1
+
+		-> icy.read:
+		if (new meta)
+			t->meta = ...
+			t->meta_changed = 1
+
+			-> q.agent:
+			if (qe->meta_priority)
+				t->meta << qe->meta
+			if (t->meta_changed && !qe->meta_priority)
+				qe->meta = t->meta
+			t->meta << q->conf.tconf.meta
+
+				-> ui:
+				if (t->meta_changed)
+					read t->meta
+
+					-> fmt.write
+					output <- unique t->meta
+
+ui: read qe->meta
+```
+
 ## GUI Playlist Synchronization
 
 ```C

src/adev/pulse-play.h

@@ -104,9 +104,9 @@ static int pulse_create(audio_out *a, phi_track *t)
 	mod->dev_idx = a->dev_idx;
 
 fin:
-	dbglog(t, "%s buffer %ums, %uHz"
+	dbglog(t, "%s buffer %ums, %s/%uHz"
 		, reused ? "reused" : "opened", mod->buffer_length_msec
-		, mod->fmt.rate);
+		, phi_af_name(mod->fmt.format), mod->fmt.rate);
 
 	mod->usedby = a;
 	t->oaudio.adev_ctx = a;

src/core/queue-entry.h

@@ -136,25 +136,6 @@ static void qe_close(void *f, phi_track *t)
 	if (e->trk == t) {
 		e->trk = NULL;
 
-		if (e->q && !e->q->conf.conversion && !e->pub.meta_priority) {
-			int mod = (META_LEN(&e->pub.meta) || META_LEN(&t->meta)); // empty meta == not modified
-			if (META_LEN(&t->meta)) {
-				fflock_lock((fflock*)&e->pub.lock); // UI thread may read or write `conf.meta` at this moment
-				core->metaif->destroy(&e->pub.meta);
-				e->pub.meta = t->meta; // Remember the tags we read from file in this track
-				fflock_unlock((fflock*)&e->pub.lock);
-				meta_zero(&t->meta);
-			}
-
-			if (t->audio.total != ~0ULL && t->audio.format.rate) {
-				uint64 duration_msec = samples_to_msec(t->audio.total, t->audio.format.rate);
-				e->pub.length_sec = duration_msec / 1000;
-			}
-
-			if (mod)
-				q_modified(e->q);
-		}
-
 		if (e->expand || t->meta_reading)
 			core->track->stop(t);
 	}
@@ -193,6 +174,45 @@ static const phi_filter phi_queue_guard = {
 	"queue-guard"
 };
 
+
+static int qagt_process(void *f, phi_track *t)
+{
+	struct q_entry *e = t->qent;
+
+	// 't->meta' currently contains the metadata read from file
+
+	if (META_LEN(&e->pub.meta) && e->pub.meta_priority)
+		core->metaif->copy(&t->meta, &e->pub.meta, PHI_META_REPLACE); // Copy tags from .cue, e.g. `TITLE value`
+
+	if (t->meta_changed && !e->pub.meta_priority) {
+
+		if (t->audio.total != ~0ULL && t->audio.format.rate)
+			e->pub.length_sec = samples_to_msec(t->audio.total, t->audio.format.rate) / 1000;
+
+		if (META_LEN(&e->pub.meta) || META_LEN(&t->meta)) { // empty meta == not modified
+			fflock_lock((fflock*)&e->pub.lock); // UI thread may read or write `meta` at this moment
+			core->metaif->destroy(&e->pub.meta);
+			core->metaif->copy(&e->pub.meta, &t->meta, 0); // Remember the tags we read from file
+			fflock_unlock((fflock*)&e->pub.lock);
+			q_modified(e->q);
+		}
+	}
+
+	if (META_LEN(&e->q->conf.tconf.meta))
+		core->metaif->copy(&t->meta, &e->q->conf.tconf.meta, PHI_META_REPLACE); // Copy tags from user, e.g. `convert -m title=...`
+
+	// 't->meta' contains the aggregated metadata from user + from .cue + from file
+
+	t->data_out = t->data_in;
+	return !(t->chain_flags & PHI_FFIRST) ? PHI_OK : PHI_DONE;
+}
+
+static const phi_filter queue_agent = {
+	NULL, NULL, qagt_process,
+	"queue-agent"
+};
+
+
 static int qe_play(struct q_entry *e)
 {
 	if (e->expand) {
@@ -215,13 +235,15 @@ static int qe_play(struct q_entry *e)
 		&& !track->filter(t, e->q->conf.first_filter, 0))
 		goto err;
 
+	track->filter(t, &phi_queue_guard, 0);
+	track->filter(t, core->mod("core.auto-input"), 0);
+
 	if (e->q->conf.conversion) {
-		if (!track->filter(t, &phi_queue_guard, 0)
-			|| !track->filter(t, core->mod("core.auto-input"), 0)
-			|| !track->filter(t, core->mod("format.detect"), 0)
+		if (!track->filter(t, core->mod("format.detect"), 0)
 			|| !track->filter(t, core->mod("afilter.until"), 0)
 			|| (c.afilter.danorm
 				&& !track->filter(t, core->mod("af-danorm.f"), 0))
+			|| !track->filter(t, &queue_agent, 0)
 			|| !track->filter(t, ui_if, 0)
 			|| (c.afilter.gain_db
 				&& !track->filter(t, core->mod("afilter.gain"), 0))
@@ -232,10 +254,9 @@ static int qe_play(struct q_entry *e)
 		t->output.allow_async = 1;
 
 	} else if (e->q->conf.analyze) {
-		if (!track->filter(t, &phi_queue_guard, 0)
-			|| !track->filter(t, core->mod("core.auto-input"), 0)
-			|| !track->filter(t, core->mod("format.detect"), 0)
+		if (!track->filter(t, core->mod("format.detect"), 0)
 			|| !track->filter(t, core->mod("afilter.until"), 0)
+			|| !track->filter(t, &queue_agent, 0)
 			|| !track->filter(t, ui_if, 0)
 			|| ((c.afilter.peaks_info
 				|| c.afilter.loudness_summary)
@@ -247,12 +268,11 @@ static int qe_play(struct q_entry *e)
 			goto err;
 
 	} else {
-		if (!track->filter(t, &phi_queue_guard, 0)
-			|| !track->filter(t, core->mod("core.auto-input"), 0)
-			|| (c.tee && !c.tee_output
+		if ((c.tee && !c.tee_output
 				&& !track->filter(t, core->mod("core.tee"), 0))
 			|| !track->filter(t, core->mod("format.detect"), 0)
 			|| !track->filter(t, core->mod("afilter.until"), 0)
+			|| !track->filter(t, &queue_agent, 0)
 			|| !track->filter(t, ui_if, 0)
 			|| (c.afilter.rg_normalizer
 				&& !track->filter(t, core->mod("afilter.rg-norm"), 0))
@@ -270,11 +290,6 @@ static int qe_play(struct q_entry *e)
 			goto err;
 	}
 
-	if (META_LEN(&e->q->conf.tconf.meta))
-		core->metaif->copy(&t->meta, &e->q->conf.tconf.meta, 0); // from user
-	if (META_LEN(&e->pub.meta) && e->pub.meta_priority)
-		core->metaif->copy(&t->meta, &e->pub.meta, (META_LEN(&e->q->conf.tconf.meta)) ? PHI_META_UNIQUE : 0); // from .cue
-
 	e->trk = t;
 	e->used++;
 	e->q->active_n++;

src/exe/gui.h

@@ -5,16 +5,20 @@ static int gui_help()
 {
 	help_info_write("\
 Show graphical interface:\n\
-    `phiola gui` [INPUT...]\n\
+    `phiola gui` [OPTIONS] [INPUT...]\n\
 \n\
 INPUT                   File name, directory or URL\n\
+\n\
+Options:\n\
+  `-multi`                Multi-window mode\n\
 ");
 	x->exit_code = 0;
 	return 1;
 }
 
 struct cmd_gui {
 	ffvec input; // ffstr[]
+	u_char	multi_window;
 };
 
 static int gui_input(struct cmd_gui *g, ffstr s)
@@ -30,8 +34,9 @@ static void gui_log_ctl(uint flags)
 		x->log.func = NULL;
 }
 
-static int gui_action(struct cmd_gui *g)
+static int gui_single_mode(struct cmd_gui *g)
 {
+	int rc = 1;
 	const phi_remote_cl_if *rcl = x->core->mod("remote.client");
 	ffvec inz = {};
 	ffstr *it;
@@ -45,13 +50,25 @@ static int gui_action(struct cmd_gui *g)
 
 	const phi_remote_sv_if *rsv = x->core->mod("remote.server");
 	rsv->start("gui");
+	rc = 0;
+
+end:
+	ffvec_free(&inz);
+	return rc;
+}
+
+static int gui_action(struct cmd_gui *g)
+{
+	if (!g->multi_window && gui_single_mode(g))
+		goto end;
 
 	struct phi_queue_conf qc = {
 		.first_filter = &phi_guard_gui,
 		.ui_module = "gui.track",
 	};
 	x->queue->create(&qc);
 
+	ffstr *it;
 	FFSLICE_WALK(&g->input, it) {
 		struct phi_queue_entry qe = {
 			.url = it->ptr,
@@ -73,7 +90,6 @@ static int gui_action(struct cmd_gui *g)
 	}
 
 end:
-	ffvec_free(&inz);
 	x->exit_code = 0;
 	return 0;
 }
@@ -83,11 +99,14 @@ static int gui_open()
 	return 0;
 }
 
+#define O(m)  (void*)FF_OFF(struct cmd_gui, m)
 static const struct ffarg cmd_gui[] = {
 	{ "-help",		0,		gui_help },
+	{ "-multi",		'1',	O(multi_window) },
 	{ "\0\1",		'S',	gui_input },
 	{ "",			0,		gui_open },
 };
+#undef O
 
 static void cmd_gui_free(struct cmd_gui *g)
 {

src/format/reader.h

@@ -216,6 +216,7 @@ static int fmtr_process(struct fmt_rd *f, phi_track *t)
 		ffmem_zero_obj(&res);
 		switch (avpk_read(&f->rd, in, &res)) {
 		case AVPK_HEADER: {
+			t->meta_changed = 1;
 			if (f->sample_rate) {
 				if (!(t->audio.format.rate == res.hdr.sample_rate
 					&& t->audio.format.channels == res.hdr.channels)) {
@@ -225,7 +226,6 @@ static int fmtr_process(struct fmt_rd *f, phi_track *t)
 
 				dbglog(t, "new logical stream");
 				core->metaif->destroy(&t->meta);
-				t->meta_changed = 1;
 				t->audio.ogg_reset = 1;
 				break;
 			}

src/gui/about.hpp

@@ -30,7 +30,7 @@ static void wabout_action(ffui_window *wnd, int id)
 
 void wabout_init()
 {
-	gui_wabout *a = ffmem_new(gui_wabout);
+	gui_wabout *a = gui_allocT(gui_wabout);
 	a->wnd.hide_on_close = 1;
 	a->wnd.on_action = wabout_action;
 	gg->wabout = a;

src/gui/convert.hpp

@@ -279,7 +279,7 @@ static void wconvert_action(ffui_window *wnd, int id)
 
 void wconvert_init()
 {
-	gui_wconvert *c = ffmem_new(gui_wconvert);
+	gui_wconvert *c = gui_allocT(gui_wconvert);
 	c->wnd.hide_on_close = 1;
 	c->wnd.on_action = wconvert_action;
 	c->conf_mp3q = ~0U;

src/gui/goto.hpp

@@ -50,7 +50,7 @@ void wgoto_show(uint pos)
 
 void wgoto_init()
 {
-	gui_wgoto *g = ffmem_new(gui_wgoto);
+	gui_wgoto *g = gui_allocT(gui_wgoto);
 	gg->wgoto = g;
 	g->wnd.hide_on_close = 1;
 	g->wnd.on_action = wgoto_action;