X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=aft.c;h=1afc16bc542b3812687af3a58df97b941586d885;hb=refs%2Fheads%2Fmaint;hp=b358c96cd9afd23bfa7f043c8add8bbf8b4bfade;hpb=3ccea2ef0eff8e9acc5d34528645d3e29bc9a4f9;p=paraslash.git

diff --git a/aft.c b/aft.c
index b358c96c..a15a1d2c 100644
--- a/aft.c
+++ b/aft.c
@@ -800,6 +800,12 @@ static int print_chunk_table(struct ls_data *d, struct para_buffer *b)
 	int ret, i;
 	char *buf;
 
+	para_printf(b, "%s\nchunk_time: %lu:%lu\n", d->path,
+		(long unsigned) d->afhi.chunk_tv.tv_sec,
+		(long unsigned) d->afhi.chunk_tv.tv_usec
+	);
+	if (afh_supports_dynamic_chunks(d->afsi.audio_format_id))
+		return 0;
 	ret = aft_get_row_of_hash(d->hash, &aft_row);
 	if (ret < 0)
 		return ret;
@@ -807,12 +813,7 @@ static int print_chunk_table(struct ls_data *d, struct para_buffer *b)
 		AFTCOL_CHUNKS, &chunk_table_obj));
 	if (ret < 0)
 		return ret;
-	para_printf(b, "%s\n"
-		"chunk_time: %lu:%lu\nchunk_offsets: ",
-		d->path,
-		(long unsigned) d->afhi.chunk_tv.tv_sec,
-		(long unsigned) d->afhi.chunk_tv.tv_usec
-	);
+	para_printf(b, "chunk_offsets: ");
 	buf = chunk_table_obj.data;
 	for (
 		i = 0;
@@ -1024,7 +1025,14 @@ out:
 /**
  * Open the audio file with highest score and set up an afd structure.
  *
- * \param afd Result pointer.
+ * This determines and opens the next audio file, verifies that it did not
+ * change by comparing the recomputed the hash value of the file contents
+ * against the value stored in the audio file table. If all goes well, it
+ * creates a shared memory area containing the serialized version of the afd
+ * structure, including the chunk table, if any. The caller can then send the
+ * ID of this area and the open fd to the server process.
+ *
+ * \param fd Result pointer for the file descriptor of the audio file.
  *
  * On success, the numplayed field of the audio file selector info is increased
  * and the lastplayed time is set to the current time. Finally, the score of
@@ -1032,7 +1040,7 @@ out:
  *
  * \return Positive shmid on success, negative on errors.
  */
-int open_and_update_audio_file(struct audio_file_data *afd)
+int open_and_update_audio_file(int *fd)
 {
 	unsigned char file_hash[HASH_SIZE];
 	struct osl_object afsi_obj;
@@ -1042,6 +1050,7 @@ int open_and_update_audio_file(struct audio_file_data *afd)
 	struct osl_object map, chunk_table_obj;
 	struct ls_data *d = &status_item_ls_data;
 	unsigned char *tmp_hash;
+	struct audio_file_data afd;
 again:
 	ret = score_get_best(&current_aft_row, &d->score);
 	if (ret < 0)
@@ -1074,11 +1083,11 @@ again:
 	ret = load_afsi(&d->afsi, &afsi_obj);
 	if (ret < 0)
 		return ret;
-	ret = get_afhi_of_row(current_aft_row, &afd->afhi);
+	ret = get_afhi_of_row(current_aft_row, &afd.afhi);
 	if (ret < 0)
 		return ret;
-	d->afhi = afd->afhi;
-	d->afhi.chunk_table = afd->afhi.chunk_table = NULL;
+	d->afhi = afd.afhi;
+	d->afhi.chunk_table = afd.afhi.chunk_table = NULL;
 	ret = osl(osl_open_disk_object(audio_file_table, current_aft_row,
 		AFTCOL_CHUNKS, &chunk_table_obj));
 	if (ret < 0) {
@@ -1090,7 +1099,7 @@ again:
 	} else {
 		PARA_INFO_LOG("chunk table: %zu bytes\n", chunk_table_obj.size);
 	}
-	ret = mmap_full_file(d->path, O_RDONLY, &map.data, &map.size, &afd->fd);
+	ret = mmap_full_file(d->path, O_RDONLY, &map.data, &map.size, fd);
 	if (ret < 0)
 		goto out;
 	hash_function(map.data, map.size, file_hash);
@@ -1105,8 +1114,8 @@ again:
 	new_afsi.last_played = time(NULL);
 	save_afsi(&new_afsi, &afsi_obj); /* in-place update */
 
-	afd->audio_format_id = d->afsi.audio_format_id;
-	load_chunk_table(&afd->afhi, &chunk_table_obj);
+	afd.audio_format_id = d->afsi.audio_format_id;
+	load_chunk_table(&afd.afhi, &chunk_table_obj);
 	aced.aft_row = current_aft_row;
 	aced.old_afsi = &d->afsi;
 	/*
@@ -1116,9 +1125,9 @@ again:
 	ret = afs_event(AFSI_CHANGE, NULL, &aced);
 	if (ret < 0)
 		goto out;
-	ret = save_afd(afd);
+	ret = save_afd(&afd);
 out:
-	free(afd->afhi.chunk_table);
+	free(afd.afhi.chunk_table);
 	if (chunk_table_obj.data)
 		osl_close_disk_object(&chunk_table_obj);
 	if (ret < 0) {
@@ -1436,7 +1445,7 @@ static int com_ls(struct command_context *cc, struct lls_parse_result *lpr)
 		else if (!strcmp(val, "m") || !strcmp(val, "mbox"))
 			opts->mode = LS_MODE_MBOX;
 		else if (!strcmp(val, "c") || !strcmp(val, "chunk-table"))
-			opts->mode = LS_MODE_MBOX;
+			opts->mode = LS_MODE_CHUNKS;
 		else if (!strcmp(val, "p") || !strcmp(val, "parser-friendly"))
 			opts->mode = LS_MODE_PARSER;
 		else {