From 437cb7c4523584bc3c118bfffc9d6c8a6d42a270 Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Tue, 18 Feb 2020 20:59:08 -0800 Subject: [PATCH] Fix aif2pcm Pascal string bug, allow flexibility in marker names for loop --- tools/aif2pcm/main.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/tools/aif2pcm/main.c b/tools/aif2pcm/main.c index 51dbf1bb9a..f2e2349d08 100644 --- a/tools/aif2pcm/main.c +++ b/tools/aif2pcm/main.c @@ -238,18 +238,17 @@ void read_aif(struct Bytes *aif, AifData *aif_data) char *marker_name = (char *)malloc((marker_name_size + 1) * sizeof(char)); memcpy(marker_name, &aif->data[pos], marker_name_size); marker_name[marker_name_size] = '\0'; - pos += marker_name_size; + pos += marker_name_size + !(marker_name_size & 1); - if (strcmp(marker_name, "START") == 0) + if (i == 0) { aif_data->loop_offset = marker_position; aif_data->has_loop = true; } - else if (strcmp(marker_name, "END") == 0) + else if (i == 1) { - if (!aif_data->has_loop) { + if (marker_position < aif_data->loop_offset) { aif_data->loop_offset = marker_position; - aif_data->has_loop = true; } aif_data->num_samples = marker_position; }