afhi->seconds_total = read_u32(buf + AFHI_SECONDS_TOTAL_OFFSET);
afhi->bitrate = read_u32(buf + AFHI_BITRATE_OFFSET);
afhi->frequency = read_u32(buf + AFHI_FREQUENCY_OFFSET);
- afhi->channels = read_u8(buf + AFHI_CHANNELS_OFFSET);
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);
ms2tv(read_u16(buf + AFHI_EOF_OFFSET), &afhi->eof_tv);
strcpy(afhi->info_string, buf + AFHI_INFO_STRING_OFFSET);
}
* and the lastplayed time is set to the current time. Finally, the score of
* the audio file is updated.
*
- * \return Positive on success, negative on errors.
+ * \return Positive shmid on success, negative on errors.
*/
-int open_and_update_audio_file(struct osl_row *aft_row, struct audio_file_data *afd)
+int open_and_update_audio_file(struct osl_row *aft_row,
+ struct audio_file_data *afd, long score)
{
HASH_TYPE *aft_hash, file_hash[HASH_SIZE];
struct osl_object afsi_obj;
- struct afs_info new_afsi;
+ struct afs_info old_afsi, new_afsi;
int ret = get_hash_of_row(aft_row, &aft_hash);
struct afsi_change_event_data aced;
struct osl_object map, chunk_table_obj;
ret = get_audio_file_path_of_row(aft_row, &path);
if (ret < 0)
return ret;
- strncpy(afd->path, path, sizeof(afd->path) - 1);
- afd->path[sizeof(afd->path) - 1] = '\0';
ret = get_afsi_object_of_row(aft_row, &afsi_obj);
if (ret < 0)
return ret;
- ret = load_afsi(&afd->afsi, &afsi_obj);
+ ret = load_afsi(&old_afsi, &afsi_obj);
if (ret < 0)
return ret;
ret = get_afhi_of_row(aft_row, &afd->afhi);
ret = -E_HASH_MISMATCH;
goto err;
}
- new_afsi = afd->afsi;
+ new_afsi = old_afsi;
new_afsi.num_played++;
new_afsi.last_played = time(NULL);
save_afsi(&new_afsi, &afsi_obj); /* in-place update */
{
struct ls_data d = {
.afhi = afd->afhi,
- .afsi = afd->afsi,
+ .afsi = old_afsi,
.path = path,
- .score = afd->score,
+ .score = score,
.hash = file_hash
};
struct para_buffer pb = {.buf = NULL};
ret = make_status_items(&d, &pb);
if (ret < 0)
goto err;
- strncpy(afd->afs_status_info, pb.buf, AFS_STATUS_INFO_SIZE);
- afd->afs_status_info[AFS_STATUS_INFO_SIZE - 1] = '\0';
+ strncpy(afd->verbose_ls_output, pb.buf, VERBOSE_LS_OUTPUT_SIZE);
+ afd->verbose_ls_output[VERBOSE_LS_OUTPUT_SIZE - 1] = '\0';
free(pb.buf);
}
aced.aft_row = aft_row;
- aced.old_afsi = &afd->afsi;
+ 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;
return width + 6;
}
-static void get_duration_buf(int seconds, char *buf, short unsigned max_width)
+static void get_duration_buf(int seconds, char *buf, struct ls_options *opts)
{
unsigned hours = seconds / 3600, mins = (seconds % 3600) / 60;
+ short unsigned max_width;
- if (!hours) /* m:ss or mm:ss */
+ if (!hours) { /* m:ss or mm:ss */
+ max_width = opts->mode == LS_MODE_LONG?
+ opts->widths.duration_width : 4;
sprintf(buf, "%*u:%02u", max_width - 3, mins, seconds % 60);
- else /* more than one hour => h:mm:ss, hh:mm:ss, hhh:mm:ss, ... */
+ } else { /* more than one hour => h:mm:ss, hh:mm:ss, hhh:mm:ss, ... */
+ max_width = opts->mode == LS_MODE_LONG?
+ opts->widths.duration_width : 7;
sprintf(buf, "%*u:%02u:%02u", max_width - 6, hours, mins,
seconds % 60);
+ }
}
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("%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;
}
-static char *make_lyrics_line(struct afs_info *afsi)
+static char *make_lyrics_lines(struct afs_info *afsi)
{
char *lyrics_name;
lyr_get_name_by_id(afsi->lyrics_id, &lyrics_name);
- if (!lyrics_name)
- return make_message("%u", afsi->lyrics_id);
- return make_message("%u (%s)", afsi->lyrics_id, lyrics_name);
+ return make_message("lyrics_id: %u\nlyrics_name: %s\n",
+ afsi->lyrics_id, lyrics_name? lyrics_name : "(none)");
}
-static char *make_image_line(struct afs_info *afsi)
+static char *make_image_lines(struct afs_info *afsi)
{
char *image_name;
img_get_name_by_id(afsi->image_id, &image_name);
- if (!image_name)
- return make_message("%u", afsi->image_id);
- return make_message("%u (%s)", afsi->image_id, image_name);
+ return make_message("image_id: %u\nimage_name: %s\n",
+ afsi->image_id, image_name? image_name : "(none)");
+}
+
+static char *make_filename_lines(const char *path, unsigned flags)
+{
+ char *basename, *dirname;
+ char *ret;
+
+ if (!(flags & LS_FLAG_FULL_PATH))
+ return make_message("%s: %s\n%s:\n", "basename", path,
+ "dir");
+ 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);
+ free(basename);
+ free(dirname);
+ return ret;
}
static int print_list_item(struct ls_data *d, struct ls_options *opts,
struct ls_widths *w = &opts->widths;
int have_score = opts->flags & LS_FLAG_ADMISSIBLE_ONLY;
char asc_hash[2 * HASH_SIZE + 1];
- char *att_lines, *lyrics_line, *image_line;
+ char *att_lines, *lyrics_lines, *image_lines, *filename_lines;
if (opts->mode == LS_MODE_SHORT) {
para_printf(b, "%s\n", d->path);
sizeof(last_played_time), current_time, opts->mode);
if (ret < 0)
return ret;
- get_duration_buf(afhi->seconds_total, duration_buf, w->duration_width);
+ get_duration_buf(afhi->seconds_total, duration_buf, opts);
if (have_score) {
if (opts->mode == LS_MODE_LONG)
sprintf(score_buf, "%*li ", w->score_width, d->score);
}
hash_to_asc(d->hash, asc_hash);
att_lines = make_attribute_lines(att_buf, afsi);
- lyrics_line = make_lyrics_line(afsi);
- image_line = make_image_line(afsi);
+ lyrics_lines = make_lyrics_lines(afsi);
+ image_lines = make_image_lines(afsi);
+ filename_lines = make_filename_lines(d->path, opts->flags);
if (opts->mode == LS_MODE_VERBOSE) {
para_printf(b,
- "%s: %s\n" /* path */
+ "%s" /* filename stuff */
"%s%s%s" /* score */
- "attributes: %s\n"
+ "%s\n" /* attributes */
"hash: %s\n"
- "image_id: %s\n"
- "lyrics_id: %s\n"
- "bitrate: %dkbit/s\n"
+ "%s" /* image id, image name */
+ "%s" /* lyrics */
+ "%s: %dkbit/s\n" /* bitrate */
"format: %s\n"
- "frequency: %dHz\n"
+ "%s: %dHz\n" /* frequency */
"channels: %d\n"
"duration: %s\n"
+ "seconds_total: %lu\n"
"num_played: %d\n"
"last_played: %s\n"
- "tag info: %s\n",
- (opts->flags & LS_FLAG_FULL_PATH)?
- "path" : "file", d->path,
+ "%s\n", /* tag info */
+ filename_lines,
have_score? "score: " : "", score_buf,
have_score? "\n" : "",
att_lines,
asc_hash,
- image_line,
- lyrics_line,
- afhi->bitrate,
+ image_lines,
+ lyrics_lines,
+ status_item_list[SI_BITRATE], afhi->bitrate,
audio_format_name(afsi->audio_format_id),
- afhi->frequency,
+ status_item_list[SI_FREQUENCY], afhi->frequency,
afhi->channels,
duration_buf,
+ afhi->seconds_total,
afsi->num_played,
last_played_time,
afhi->info_string
"%s%s%s" /* score */
"%s\n" /* attributes */
"hash: %s\n"
- "image_id: %s\n"
+ "%s\n" /* image id, image name */
"lyrics_id: %s\n"
"bitrate: %dkbit/s\n"
"format: %s\n"
"channels: %d\n"
"duration: %s\n"
"num_played: %d\n"
- "tag info: %s\n"
+ "%s\n" /* tag info */
"%s%s\n",
last_played_time,
d->path,
have_score? "\n" : "",
att_lines,
asc_hash,
- image_line,
- lyrics_line,
+ image_lines,
+ lyrics_lines,
afhi->bitrate,
audio_format_name(afsi->audio_format_id),
afhi->frequency,
osl_close_disk_object(lyrics_def.data);
}
free(att_lines);
- free(lyrics_line);
- free(image_line);
+ free(lyrics_lines);
+ free(image_lines);
+ free(filename_lines);
return 1;
}
objs[AFTCOL_AFSI].size = AFSI_SIZE;
save_afsi(&default_afsi, &objs[AFTCOL_AFSI]);
ret = osl_add_and_get_row(audio_file_table, objs, &aft_row);
+ afs_event(AUDIO_FILE_ADD, &msg, aft_row);
out:
if (ret < 0)
para_printf(&msg, "%s\n", PARA_STRERROR(-ret));
return 0;
result->data = msg.buf;
result->size = msg.size;
- afs_event(AUDIO_FILE_ADD, &msg, aft_row);
return 1;
}
projects / paraslash.git / blobdiff