X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=aft.c;h=102856bafd6ecf319f50d696149dc800dd1fab5a;hp=cfb1f69773a73a2f6401bf2b93bfc1be21217412;hb=ad0a32acc373428d38e6b0f2f244ac3c31eea7c5;hpb=fdb03951ee708a42795d4abb36d3a8637c478975

diff --git a/aft.c b/aft.c
index cfb1f697..102856ba 100644
--- a/aft.c
+++ b/aft.c
@@ -1573,16 +1573,16 @@ static struct osl_row *find_hash_sister(unsigned char *hash)
 
 /** The format of the data stored by save_audio_file_data(). */
 enum com_add_buffer_offsets {
-	/** afhi (if present) starts here. */
+	/* afhi (if present) starts at this offset. */
 	CAB_AFHI_OFFSET_POS = 0,
 	/** Start of the chunk table (if present). */
-	CAB_CHUNKS_OFFSET_POS = 2,
-	/** Audio format id. */
-	CAB_AUDIO_FORMAT_OFFSET = 4,
+	CAB_CHUNKS_OFFSET_POS = 4,
 	/** Flags given to the add command. */
-	CAB_FLAGS_OFFSET = 5,
+	CAB_FLAGS_OFFSET = 8,
+	/** Audio format id. */
+	CAB_AUDIO_FORMAT_ID_OFFSET = 12,
 	/** The hash of the audio file being added. */
-	CAB_HASH_OFFSET = 9,
+	CAB_HASH_OFFSET = 13,
 	/** Start of the path of the audio file. */
 	CAB_PATH_OFFSET = (CAB_HASH_OFFSET + HASH_SIZE),
 };
@@ -1603,27 +1603,23 @@ static void save_add_callback_buffer(unsigned char *hash, const char *path,
 	size_t size = CAB_PATH_OFFSET + path_len + afhi_size
 		+ sizeof_chunk_table(afhi);
 	char *buf = para_malloc(size);
-	uint16_t pos;
-
-	write_u8(buf + CAB_AUDIO_FORMAT_OFFSET, audio_format_num);
-	write_u32(buf + CAB_FLAGS_OFFSET, flags);
-
-	memcpy(buf + CAB_HASH_OFFSET, hash, HASH_SIZE);
-	strcpy(buf + CAB_PATH_OFFSET, path);
+	uint32_t pos;
 
 	pos = CAB_PATH_OFFSET + path_len;
-	PARA_DEBUG_LOG("size: %zu, afhi starts at %d\n", size, pos);
-	PARA_DEBUG_LOG("last afhi byte: %p, pos %zu\n", buf + pos + afhi_size - 1,
-		pos + afhi_size - 1);
-	write_u16(buf + CAB_AFHI_OFFSET_POS, pos);
+	write_u32(buf + CAB_AFHI_OFFSET_POS, pos);
 	save_afhi(afhi, buf + pos);
-
 	pos += afhi_size;
-	PARA_DEBUG_LOG("size: %zu, chunks start at %d\n", size, pos);
-	write_u16(buf + CAB_CHUNKS_OFFSET_POS, pos);
+
+	write_u32(buf + CAB_CHUNKS_OFFSET_POS, pos);
 	if (afhi)
 		save_chunk_table(afhi, buf + pos);
-	PARA_DEBUG_LOG("last byte in buf: %p\n", buf + size - 1);
+
+	write_u32(buf + CAB_FLAGS_OFFSET, flags);
+	write_u8(buf + CAB_AUDIO_FORMAT_ID_OFFSET, audio_format_num);
+
+	memcpy(buf + CAB_HASH_OFFSET, hash, HASH_SIZE);
+	strcpy(buf + CAB_PATH_OFFSET, path);
+
 	obj->data = buf;
 	obj->size = size;
 }
@@ -1767,8 +1763,8 @@ static void com_add_callback(int fd, const struct osl_object *query)
 			goto out;
 	}
 	/* no hs or force mode, child must have sent afhi */
-	afhi_offset = read_u16(buf + CAB_AFHI_OFFSET_POS);
-	chunks_offset = read_u16(buf + CAB_CHUNKS_OFFSET_POS);
+	afhi_offset = read_u32(buf + CAB_AFHI_OFFSET_POS);
+	chunks_offset = read_u32(buf + CAB_CHUNKS_OFFSET_POS);
 
 	objs[AFTCOL_AFHI].data = buf + afhi_offset;
 	objs[AFTCOL_AFHI].size = chunks_offset - afhi_offset;
@@ -1821,7 +1817,7 @@ static void com_add_callback(int fd, const struct osl_object *query)
 			goto out;
 	}
 	default_afsi.last_played = time(NULL) - 365 * 24 * 60 * 60;
-	default_afsi.audio_format_id = read_u8(buf + CAB_AUDIO_FORMAT_OFFSET);
+	default_afsi.audio_format_id = read_u8(buf + CAB_AUDIO_FORMAT_ID_OFFSET);
 
 	objs[AFTCOL_AFSI].data = &afsi_buf;
 	objs[AFTCOL_AFSI].size = AFSI_SIZE;