Allow up to 255 sequences to be scanned.

src/common.h

@@ -233,7 +233,7 @@ int libxmp_snprintf (char *, size_t, const char *, ...);
 #define DEFAULT_TIME_FACTOR	10.0
 #define MED_TIME_FACTOR		2.64
 
-#define MAX_SEQUENCES		16
+#define MAX_SEQUENCES		255
 #define MAX_SAMPLE_SIZE		0x10000000
 #define MAX_SAMPLES		1024
 #define MAX_INSTRUMENTS		255
@@ -348,6 +348,13 @@ struct virt_channel {
 	int map;
 };
 
+struct scan_data {
+	int time;			/* replay time in ms */
+	int row;
+	int ord;
+	int num;
+};
+
 struct player_data {
 	int ord;
 	int pos;
@@ -372,12 +379,7 @@ struct player_data {
 
 	struct flow_control flow;
 
-	struct {
-		int time;		/* replay time in ms */
-		int ord;
-		int row;
-		int num;
-	} scan[MAX_SEQUENCES];
+	struct scan_data *scan;
 
 	struct channel_data *xc_data;
 

src/load_helpers.c

@@ -309,6 +309,7 @@ int libxmp_prepare_scan(struct context_data *ctx)
 
 void libxmp_free_scan(struct context_data *ctx)
 {
+	struct player_data *p = &ctx->p;
 	struct module_data *m = &ctx->m;
 	struct xmp_module *mod = &m->mod;
 	int i;
@@ -320,6 +321,9 @@ void libxmp_free_scan(struct context_data *ctx)
 		free(m->scan_cnt);
 		m->scan_cnt = NULL;
 	}
+
+	free(p->scan);
+	p->scan = NULL;
 }
 
 /* Process player personality flags */

src/scan.c

@@ -525,10 +525,18 @@ int libxmp_scan_sequences(struct context_data *ctx)
 	struct player_data *p = &ctx->p;
 	struct module_data *m = &ctx->m;
 	struct xmp_module *mod = &m->mod;
+	struct scan_data *s;
 	int i, ep;
 	int seq;
 	unsigned char temp_ep[XMP_MAX_MOD_LENGTH];
 
+	s = realloc(p->scan, MAX(1, mod->len) * sizeof(struct scan_data));
+	if (!s) {
+		D_(D_CRIT "failed to allocate scan data");
+		return -1;
+	}
+	p->scan = s;
+
 	/* Initialize order data to prevent overwrite when a position is used
 	 * multiple times at different starting points (see janosik.xm).
 	 */
@@ -567,6 +575,12 @@ int libxmp_scan_sequences(struct context_data *ctx)
 		}
 	}
 
+	if (seq < mod->len) {
+		s = realloc(p->scan, seq * sizeof(struct scan_data));
+		if (s != NULL) {
+			p->scan = s;
+		}
+	}
 	m->num_sequences = seq;
 
 	/* Now place entry points in the public accessible array */

test-dev/test_api_scan_module.c

@@ -5,7 +5,9 @@ TEST(test_api_scan_module)
 {
 	xmp_context opaque;
 	struct context_data *ctx;
+	struct xmp_module_info minfo;
 	struct xmp_frame_info info;
+	int ret;
 	int i;
 
 	opaque = xmp_create_context();
@@ -32,6 +34,21 @@ TEST(test_api_scan_module)
 		fail_unless(info.total_time == 5720, "total time error");
 	}
 
+	xmp_release_module(opaque);
+
+	/* Load something with an absurd number of sequences. */
+	ret = xmp_load_module(opaque, "data/scan_240_seq.it");
+	fail_unless(ret == 0, "load module");
+
+	xmp_scan_module(opaque);
+
+	xmp_get_module_info(opaque, &minfo);
+	fail_unless(minfo.num_sequences == 240, "should have 240 sequences");
+
+	for (i = 0; i < minfo.num_sequences; i++) {
+		fail_unless(minfo.seq_data[i].entry_point == i, "entry point");
+	}
+	xmp_release_module(opaque);
 	xmp_free_context(opaque);
 }
 END_TEST