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_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);
if (ret < 0)
"seconds_total: %lu\n"
"num_played: %d\n"
"last_played: %s\n"
- "tag info: %s\n",
+ "%s\n", /* tag info */
filename_lines,
have_score? "score: " : "", score_buf,
have_score? "\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,
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;
}