#include "ipc.h"
#include "fd.h"
-extern const char *status_item_list[];
-
static struct timeval announce_tv;
static struct timeval data_send_barrier;
static struct timeval eof_barrier;
if (!vss_playing() || !map)
return NULL;
vss_next_chunk_time(&next_chunk);
- if (chk_barrier(audio_format_name(mmd->afd.afsi.audio_format_id),
- &now, &next_chunk, &the_timeout, 0) < 0)
+ if (chk_barrier("chunk", &now, &next_chunk, &the_timeout, 0) < 0)
return &the_timeout;
/* chunk is due or bof */
the_timeout.tv_sec = 0;
senders[i].shutdown_clients();
return;
}
+ if (mmd->new_vss_status_flags & VSS_NOMORE)
+ mmd->new_vss_status_flags = VSS_NEXT;
gettimeofday(&now, NULL);
tv_add(&mmd->afd.afhi.eof_tv, &now, &eof_barrier);
munmap(map, mmd->size);
mmd->afd.afhi.seconds_total = 0;
free(mmd->afd.afhi.chunk_table);
mmd->afd.afhi.chunk_table = NULL;
- tmp = make_message("%s:\n%s:\n%s:\n", status_item_list[SI_AUDIO_INFO1],
- status_item_list[SI_AUDIO_INFO2], status_item_list[SI_AUDIO_INFO3]);
+ tmp = make_message("%s:\n%s:\n%s:\n", status_item_list[SI_AUDIO_FILE_INFO],
+ status_item_list[SI_TAGINFO1], status_item_list[SI_TAGINFO2]);
strncpy(mmd->afd.afhi.info_string, tmp, sizeof(mmd->afd.afhi.info_string));
mmd->afd.afhi.info_string[sizeof(mmd->afd.afhi.info_string) - 1] = '\0';
+ make_empty_status_items(mmd->afd.verbose_ls_output);
free(tmp);
- mmd->afd.path[0] = '\0';
- mmd->afd.afsi.lyrics_id = 0;
- mmd->afd.afsi.image_id = 0;
mmd->mtime = 0;
- mmd->afd.attributes_string[0] = '\0';
mmd->size = 0;
mmd->events++;
}
* This function gets called from para_server to determine the timeout value
* for its main select loop.
*
+ * \param rfds The set of file descriptors to be checked for reading.
+ * \param wfds The set of file descriptors to be checked for writing.
+ * \param max_fileno The highest-numbered file descriptor.
+ *
* Before the timeout is computed, the current vss status flags are evaluated
* and acted upon by calling appropriate functions from the lower layers.
* Possible actions include
tv_add(&mmd->afd.afhi.eof_tv, &now, &eof_barrier);
if (vss_repos())
tv_add(&now, &announce_tv, &data_send_barrier);
- if (mmd->new_vss_status_flags & VSS_NOMORE)
- mmd->new_vss_status_flags = VSS_NEXT;
}
mmd->chunks_sent = 0;
}
return tv;
if (!map && vss_playing() &&
!(mmd->new_vss_status_flags & VSS_NOMORE)) {
- if (afsss == AFS_SOCKET_READY) {
+ if (afsss == AFS_SOCKET_READY ||
+ afsss == AFS_SOCKET_CHECK_FOR_WRITE) {
PARA_DEBUG_LOG("ready and playing, but no audio file\n");
para_fd_set(afs_socket, wfds, max_fileno);
afsss = AFS_SOCKET_CHECK_FOR_WRITE;
if (ret < 0)
goto err;
shm_destroy(shmid);
- PARA_NOTICE_LOG("next audio file: %s (%lu chunks)\n", mmd->afd.path,
- mmd->afd.afhi.chunks_total);
ret = fstat(passed_fd, &statbuf);
if (ret < 0) {
PARA_ERROR_LOG("fstat error:\n");
map = para_mmap(mmd->size, PROT_READ, MAP_PRIVATE,
passed_fd, 0);
close(passed_fd);
- mmd->afd.afhi.header_len = 0; /* default: no header */
mmd->chunks_sent = 0;
mmd->current_chunk = 0;
mmd->offset = 0;