Fix com_pause().
[paraslash.git] / aft.c
diff --git a/aft.c b/aft.c
index e485997..df6c259 100644 (file)
--- a/aft.c
+++ b/aft.c
@@ -313,14 +313,24 @@ enum afhi_offsets {
        AFHI_HEADER_OFFSET_OFFSET = 12,
        /* Length of the audio file header. Zero means: No header. */
        AFHI_HEADER_LEN_OFFSET = 16,
-       /** Number of channels is stored here. */
-       AFHI_CHANNELS_OFFSET = 20,
-       /** EOF timeout in ms. */
-       AFHI_EOF_OFFSET = 21,
+       /** The total number of chunks (4 bytes). */
+       CHUNKS_TOTAL_OFFSET = 20,
+       /** The length of the audio file header (4 bytes). */
+       HEADER_LEN_OFFSET = 24,
+       /** The start of the audio file header (4 bytes). */
+       HEADER_OFFSET_OFFSET = 28,
+       /** The seconds part of the chunk time (4 bytes). */
+       CHUNK_TV_TV_SEC_OFFSET = 32,
+       /** The microseconds part of the chunk time (4 bytes). */
+       CHUNK_TV_TV_USEC_OFFSET = 36,
+       /** Number of channels is stored here. (1 byte) */
+       AFHI_CHANNELS_OFFSET = 40,
+       /** EOF timeout in ms. (2 byte) */
+       AFHI_EOF_OFFSET = 41,
        /** The tag info position. */
-       AFHI_INFO_STRING_OFFSET = 23,
+       AFHI_INFO_STRING_OFFSET = 43,
        /** Minimal on-disk size of a valid afhi struct. */
-       MIN_AFHI_SIZE = 24
+       MIN_AFHI_SIZE = 44
 };
 
 static unsigned sizeof_afhi_buf(const struct afh_info *afhi)
@@ -334,16 +344,19 @@ static void save_afhi(struct afh_info *afhi, char *buf)
 {
        if (!afhi)
                return;
-       write_u32(buf + AFHI_SECONDS_TOTAL_OFFSET,
-               afhi->seconds_total);
+       write_u32(buf + AFHI_SECONDS_TOTAL_OFFSET, afhi->seconds_total);
        write_u32(buf + AFHI_BITRATE_OFFSET, afhi->bitrate);
        write_u32(buf + AFHI_FREQUENCY_OFFSET, afhi->frequency);
        write_u32(buf + AFHI_HEADER_OFFSET_OFFSET, afhi->header_offset);
        write_u32(buf + AFHI_HEADER_LEN_OFFSET, afhi->header_len);
        write_u8(buf + AFHI_CHANNELS_OFFSET, afhi->channels);
+       write_u32(buf + CHUNKS_TOTAL_OFFSET, afhi->chunks_total);
+       write_u32(buf + HEADER_LEN_OFFSET, afhi->header_len);
+       write_u32(buf + HEADER_OFFSET_OFFSET, afhi->header_offset);
+       write_u32(buf + CHUNK_TV_TV_SEC_OFFSET, afhi->chunk_tv.tv_sec);
+       write_u32(buf + CHUNK_TV_TV_USEC_OFFSET, afhi->chunk_tv.tv_usec);
        write_u16(buf + AFHI_EOF_OFFSET, tv2ms(&afhi->eof_tv));
        strcpy(buf + AFHI_INFO_STRING_OFFSET, afhi->info_string); /* OK */
-       PARA_DEBUG_LOG("last byte written: %p\n", buf + AFHI_INFO_STRING_OFFSET + strlen(afhi->info_string));
 }
 
 static void load_afhi(const char *buf, struct afh_info *afhi)
@@ -354,41 +367,26 @@ static void load_afhi(const char *buf, struct afh_info *afhi)
        afhi->header_offset = read_u32(buf + AFHI_HEADER_OFFSET_OFFSET);
        afhi->header_len = read_u32(buf + AFHI_HEADER_LEN_OFFSET);
        afhi->channels = read_u8(buf + AFHI_CHANNELS_OFFSET);
+       afhi->chunks_total = read_u32(buf + CHUNKS_TOTAL_OFFSET);
+       afhi->header_len = read_u32(buf + HEADER_LEN_OFFSET);
+       afhi->header_offset = read_u32(buf + HEADER_OFFSET_OFFSET);
+       afhi->chunk_tv.tv_sec = read_u32(buf + CHUNK_TV_TV_SEC_OFFSET);
+       afhi->chunk_tv.tv_usec = read_u32(buf + CHUNK_TV_TV_USEC_OFFSET);
        ms2tv(read_u16(buf + AFHI_EOF_OFFSET), &afhi->eof_tv);
        strcpy(afhi->info_string, buf + AFHI_INFO_STRING_OFFSET);
 }
 
-//#define SIZEOF_CHUNK_TABLE(afhi) (((afhi)->chunks_total + 1) * sizeof(uint32_t))
-
-static unsigned sizeof_chunk_info_buf(struct afh_info *afhi)
+static unsigned sizeof_chunk_table(struct afh_info *afhi)
 {
        if (!afhi)
                return 0;
-       return 4 * (afhi->chunks_total + 1) + 20;
-
+       return 4 * (afhi->chunks_total + 1);
 }
 
-/** The offsets of the data contained in the AFTCOL_CHUNKS column. */
-enum chunk_info_offsets{
-       /** The total number of chunks (4 bytes). */
-       CHUNKS_TOTAL_OFFSET = 0,
-       /** The length of the audio file header (4 bytes). */
-       HEADER_LEN_OFFSET = 4,
-       /** The start of the audio file header (4 bytes). */
-       HEADER_OFFSET_OFFSET = 8,
-       /** The seconds part of the chunk time (4 bytes). */
-       CHUNK_TV_TV_SEC_OFFSET = 12,
-       /** The microseconds part of the chunk time (4 bytes). */
-       CHUNK_TV_TV_USEC = 16,
-       /** Chunk table entries start here. */
-       CHUNK_TABLE_OFFSET = 20,
-};
-
 static void save_chunk_table(struct afh_info *afhi, char *buf)
 {
        int i;
 
-       PARA_DEBUG_LOG("%lu chunks\n", afhi->chunks_total);
        for (i = 0; i <= afhi->chunks_total; i++)
                write_u32(buf + 4 * i, afhi->chunk_table[i]);
 }
@@ -396,43 +394,12 @@ static void save_chunk_table(struct afh_info *afhi, char *buf)
 static void load_chunk_table(struct afh_info *afhi, char *buf)
 {
        int i;
+
+       afhi->chunk_table = para_malloc(sizeof_chunk_table(afhi));
        for (i = 0; i <= afhi->chunks_total; i++)
                afhi->chunk_table[i] = read_u32(buf + 4 * i);
 }
 
-/* TODO: audio format handlers could just produce this */
-static void save_chunk_info(struct afh_info *afhi, char *buf)
-{
-       if (!afhi)
-               return;
-       write_u32(buf + CHUNKS_TOTAL_OFFSET, afhi->chunks_total);
-       write_u32(buf + HEADER_LEN_OFFSET, afhi->header_len);
-       write_u32(buf + HEADER_OFFSET_OFFSET, afhi->header_offset);
-       write_u32(buf + CHUNK_TV_TV_SEC_OFFSET, afhi->chunk_tv.tv_sec);
-       write_u32(buf + CHUNK_TV_TV_USEC, afhi->chunk_tv.tv_usec);
-       save_chunk_table(afhi, buf + CHUNK_TABLE_OFFSET);
-}
-
-static int load_chunk_info(struct osl_object *obj, struct afh_info *afhi)
-{
-       char *buf = obj->data;
-
-       if (obj->size < CHUNK_TABLE_OFFSET)
-               return -E_BAD_DATA_SIZE;
-
-       afhi->chunks_total = read_u32(buf + CHUNKS_TOTAL_OFFSET);
-       afhi->header_len = read_u32(buf + HEADER_LEN_OFFSET);
-       afhi->header_offset = read_u32(buf + HEADER_OFFSET_OFFSET);
-       afhi->chunk_tv.tv_sec = read_u32(buf + CHUNK_TV_TV_SEC_OFFSET);
-       afhi->chunk_tv.tv_usec = read_u32(buf + CHUNK_TV_TV_USEC);
-
-       if ((afhi->chunks_total + 1) * 4 + CHUNK_TABLE_OFFSET > obj->size)
-               return -E_BAD_DATA_SIZE;
-       afhi->chunk_table = para_malloc((afhi->chunks_total + 1) * 4);
-       load_chunk_table(afhi, buf + CHUNK_TABLE_OFFSET);
-       return 1;
-}
-
 /**
  * Get the row of the audio file table corresponding to the given path.
  *
@@ -610,8 +577,7 @@ int get_afhi_of_row(const struct osl_row *row, struct afh_info *afhi)
 /* returns shmid on success */
 static int save_afd(struct audio_file_data *afd)
 {
-       size_t size = sizeof(*afd)
-               + 4 * (afd->afhi.chunks_total + 1);
+       size_t size = sizeof(*afd) + sizeof_chunk_table(&afd->afhi);
 
        PARA_DEBUG_LOG("size: %zu\n", size);
        int shmid, ret = shm_new(size);
@@ -647,7 +613,6 @@ int load_afd(int shmid, struct audio_file_data *afd)
        *afd = *(struct audio_file_data *)shm_afd;
        buf = shm_afd;
        buf += sizeof(*afd);
-       afd->afhi.chunk_table = para_malloc((afd->afhi.chunks_total + 1) * 4);
        load_chunk_table(&afd->afhi, buf);
        shm_detach(shm_afd);
        return 1;
@@ -710,9 +675,7 @@ int open_and_update_audio_file(struct osl_row *aft_row,
        new_afsi.last_played = time(NULL);
        save_afsi(&new_afsi, &afsi_obj); /* in-place update */
 
-       ret = load_chunk_info(&chunk_table_obj, &afd->afhi);
-       if (ret < 0)
-               goto err;
+       load_chunk_table(&afd->afhi, chunk_table_obj.data);
        {
                struct ls_data d = {
                        .afhi = afd->afhi,
@@ -733,9 +696,9 @@ int open_and_update_audio_file(struct osl_row *aft_row,
        aced.old_afsi = &old_afsi;
        afs_event(AFSI_CHANGE, NULL, &aced);
        ret = save_afd(afd);
+       free(afd->afhi.chunk_table);
        if (ret < 0)
                goto err;
-       free(afd->afhi.chunk_table);
 err:
        osl_close_disk_object(&chunk_table_obj);
        return ret;
@@ -810,8 +773,9 @@ static char *make_attribute_lines(const char *att_bitmap, struct afs_info *afsi)
        get_attribute_text(&afsi->attributes, " ", &att_text);
        if (!att_text)
                return para_strdup(att_bitmap);
-       att_lines = make_message("attributes: %s\nattributes_txt: %s",
-               att_bitmap, att_text);
+       att_lines = make_message("%s: %s\n%s: %s",
+               status_item_list[SI_ATTRIBUTES_BITMAP], att_bitmap,
+               status_item_list[SI_ATTRIBUTES_TXT], att_text);
        free(att_text);
        return att_lines;
 }
@@ -821,16 +785,20 @@ static char *make_lyrics_lines(struct afs_info *afsi)
        char *lyrics_name;
 
        lyr_get_name_by_id(afsi->lyrics_id, &lyrics_name);
-       return make_message("lyrics_id: %u\nlyrics_name: %s\n",
-               afsi->lyrics_id, lyrics_name? lyrics_name : "(none)");
+       return make_message("%s: %u\n%s: %s\n",
+               status_item_list[SI_LYRICS_ID], afsi->lyrics_id,
+               status_item_list[SI_LYRICS_NAME], lyrics_name?
+                       lyrics_name : "(none)");
 }
 
 static char *make_image_lines(struct afs_info *afsi)
 {
        char *image_name;
        img_get_name_by_id(afsi->image_id, &image_name);
-       return make_message("image_id: %u\nimage_name: %s\n",
-               afsi->image_id, image_name? image_name : "(none)");
+       return make_message("%s: %u\n%s: %s\n",
+               status_item_list[SI_IMAGE_ID], afsi->image_id,
+               status_item_list[SI_IMAGE_NAME], image_name?
+                       image_name : "(none)");
 }
 
 static char *make_filename_lines(const char *path, unsigned flags)
@@ -839,12 +807,15 @@ static char *make_filename_lines(const char *path, unsigned flags)
        char *ret;
 
        if (!(flags & LS_FLAG_FULL_PATH))
-               return make_message("%s: %s\n%s:\n", "basename", path,
-                       "dir");
+               return make_message("%s: %s\n%s:\n",
+                       status_item_list[SI_BASENAME], path,
+                       status_item_list[SI_DIRECTORY]);
        basename = para_basename(path),
        dirname = para_dirname(path);
-       ret = make_message("%s: %s\n%s: %s\n%s: %s\n", "path", path,
-               "dir", dirname, "basename", basename);
+       ret = make_message("%s: %s\n%s: %s\n%s: %s\n",
+               status_item_list[SI_PATH], path,
+               status_item_list[SI_DIRECTORY], dirname,
+               status_item_list[SI_BASENAME], basename);
        free(basename);
        free(dirname);
        return ret;
@@ -919,38 +890,40 @@ static int print_list_item(struct ls_data *d, struct ls_options *opts,
        if (opts->mode == LS_MODE_VERBOSE) {
                para_printf(b,
                        "%s" /* filename stuff */
-                       "%s%s%s" /* score */
+                       "%s%s%s%s" /* score */
                        "%s\n" /* attributes */
-                       "hash: %s\n"
+                       "%s: %s\n" /* hash */
                        "%s" /* image id, image name */
                        "%s" /* lyrics */
-                       "bitrate: %dkbit/s\n"
-                       "format: %s\n"
-                       "frequency: %dHz\n"
-                       "channels: %d\n"
-                       "duration: %s\n"
-                       "seconds_total: %lu\n"
-                       "num_played: %d\n"
-                       "last_played: %s\n"
-                       "%s\n", /* tag info */
+                       "%s: %dkbit/s\n" /* bitrate */
+                       "%s: %s\n" /* format */
+                       "%s: %dHz\n" /* frequency */
+                       "%s: %d\n" /* channels */
+                       "%s: %s\n" /* duration */
+                       "%s: %lu\n" /* seconds total */
+                       "%s: %d\n" /* num_played */
+                       "%s: %s\n" /* last_played */
+                       "%s", /* tag info */
                        filename_lines,
-                       have_score? "score: " : "", score_buf,
+                       have_score? status_item_list[SI_SCORE] : "",
+                               have_score? ": " : "",
+                               score_buf,
                                have_score? "\n" : "",
                        att_lines,
-                       asc_hash,
+                       status_item_list[SI_HASH], asc_hash,
                        image_lines,
                        lyrics_lines,
-                       afhi->bitrate,
-                       audio_format_name(afsi->audio_format_id),
-                       afhi->frequency,
-                       afhi->channels,
-                       duration_buf,
-                       afhi->seconds_total,
-                       afsi->num_played,
-                       last_played_time,
+                       status_item_list[SI_BITRATE], afhi->bitrate,
+                       status_item_list[SI_FORMAT], audio_format_name(afsi->audio_format_id),
+                       status_item_list[SI_FREQUENCY], afhi->frequency,
+                       status_item_list[SI_CHANNELS], afhi->channels,
+                       status_item_list[SI_DURATION], duration_buf,
+                       status_item_list[SI_SECONDS_TOTAL], afhi->seconds_total,
+                       status_item_list[SI_NUM_PLAYED], afsi->num_played,
+                       status_item_list[SI_LAST_PLAYED], last_played_time,
                        afhi->info_string
                );
-       } else { /* mbox mode */
+       } else { /* mbox mode */ /* FIXME: merge with verbose output */
                struct osl_object lyrics_def;
                lyr_get_def_by_id(afsi->lyrics_id, &lyrics_def);
                para_printf(b,
@@ -998,6 +971,51 @@ static int print_list_item(struct ls_data *d, struct ls_options *opts,
        return 1;
 }
 
+void make_empty_status_items(char *buf)
+{
+       sprintf(buf,
+               "%s: \n" /* path */
+               "%s: \n" /* dirname */
+               "%s: \n" /* basename */
+               "%s: \n" /* score */
+               "%s: \n" /* attributes bitnmap */
+               "%s: \n" /* attributes txt */
+               "%s: \n" /* hash */
+               "%s: \n" /* image id */
+               "%s: \n" /* image name */
+               "%s: \n" /* lyrics id */
+               "%s: \n" /* lyrics name */
+               "%s: \n" /* bitrate */
+               "%s: \n" /* format */
+               "%s: \n" /* frequency */
+               "%s: \n" /* channels */
+               "%s: \n" /* duration */
+               "%s: \n" /* seconds total */
+               "%s: \n" /* num played */
+               "%s: \n" /* last played */
+               ,
+               status_item_list[SI_PATH],
+               status_item_list[SI_DIRECTORY],
+               status_item_list[SI_BASENAME],
+               status_item_list[SI_SCORE],
+               status_item_list[SI_ATTRIBUTES_BITMAP],
+               status_item_list[SI_ATTRIBUTES_TXT],
+               status_item_list[SI_HASH],
+               status_item_list[SI_IMAGE_ID],
+               status_item_list[SI_IMAGE_NAME],
+               status_item_list[SI_LYRICS_ID],
+               status_item_list[SI_LYRICS_NAME],
+               status_item_list[SI_BITRATE],
+               status_item_list[SI_FORMAT],
+               status_item_list[SI_FREQUENCY],
+               status_item_list[SI_CHANNELS],
+               status_item_list[SI_DURATION],
+               status_item_list[SI_SECONDS_TOTAL],
+               status_item_list[SI_NUM_PLAYED],
+               status_item_list[SI_LAST_PLAYED]
+       );
+}
+
 int make_status_items(struct ls_data *d, struct para_buffer *pb)
 {
        struct ls_options opts = {
@@ -1417,7 +1435,7 @@ static void save_audio_file_info(HASH_TYPE *hash, const char *path,
        size_t path_len = strlen(path) + 1;
        size_t afhi_size = sizeof_afhi_buf(afhi);
        size_t size = AFTROW_PATH_OFFSET + path_len + afhi_size
-               + sizeof_chunk_info_buf(afhi);
+               + sizeof_chunk_table(afhi);
        char *buf = para_malloc(size);
        uint16_t pos;
 
@@ -1437,7 +1455,7 @@ static void save_audio_file_info(HASH_TYPE *hash, const char *path,
        pos += afhi_size;
        PARA_DEBUG_LOG("size: %zu, chunks start at %d\n", size, pos);
        write_u16(buf + AFTROW_CHUNKS_OFFSET_POS, pos);
-       save_chunk_info(afhi, buf + pos);
+       save_chunk_table(afhi, buf + pos);
        PARA_DEBUG_LOG("last byte in buf: %p\n", buf + size - 1);
        obj->data = buf;
        obj->size = size;