Generate placeholder filename/event earlier

Previously, a placeholder was put in the queue ("ZMQdata //" or
"ASAPOdata //"), and replaced by image_read_data_block.  Instead, the
"final" placeholder can be put in the queue already.

Note that ASAP::O, at least, will replace this placeholder with a
filename delivered by the data transport.

1 files changed, 13 insertions, 6 deletions

diff --git a/src/im-sandbox.c b/src/im-sandbox.c
index 059f4a74..158da59b 100644
--- a/src/im-sandbox.c
+++ b/src/im-sandbox.c
@@ -482,6 +482,9 @@ static int run_work(const struct index_args *iargs, Stream *st,
 			                                &event);
 			if ( pargs.zmq_data != NULL ) {
 				ok = 1;
+
+				/* ASAP::O provides a meaningful filename, which
+				 * replaces the placeholder. */
 				free(pargs.filename);
 				free(pargs.event);
 				pargs.filename = filename;
@@ -889,15 +892,19 @@ static int fill_queue(struct get_pattern_ctx *gpctx, struct sandbox *sb)
 		char *evstr;
 
 		if ( sb->zmq ) {
-			/* These values will be passed down to process_image,
-			 * but ignored.  The 'real' filename, which is still a
-			 * 'fake' filename - only for accounting purposes - will
-			 * be generated by image_read_data_block(). */
+			/* These are just semi-meaningful placeholder values to
+			 * be put into the queue, instead of "(null)".
+			 * A unique filename is needed so that the GUI can
+			 * tell the frames apart from one another.
+			 * ASAP::O, for one, will replace this with a filename
+			 * that corresponds to something real. */
 			filename = "ZMQdata";
-			evstr = strdup("//");
+			evstr = malloc(64);
+			snprintf(evstr, 64, "//%i", sb->serial);
 		} else if ( sb->asapo ) {
 			filename = "ASAPOdata";
-			evstr = strdup("//");
+			evstr = malloc(64);
+			snprintf(evstr, 64, "//%i", sb->serial);
 		} else {
 			if ( !get_pattern(gpctx, &filename, &evstr) ) return 1;
 		}