static void vss_eof(void)
{
struct timeval now;
- int i;
char *tmp;
- if (!map) {
- for (i = 0; senders[i].name; i++)
- senders[i].shutdown_clients();
- return;
- }
if (mmd->new_vss_status_flags & VSS_NOMORE)
mmd->new_vss_status_flags = VSS_NEXT;
gettimeofday(&now, NULL);
static enum afs_socket_status afsss;
+static int need_to_request_new_audio_file(void)
+{
+ if (map) /* have audio file */
+ return 0;
+ if (!vss_playing()) /* don't need one */
+ return 0;
+ if (mmd->new_vss_status_flags & VSS_NOMORE)
+ return 0;
+ if (afsss == AFS_SOCKET_AFD_PENDING) /* already requested one */
+ return 0;
+ return 1;
+}
+
/**
* Compute the timeout for para_server's main select-loop.
*
struct timeval *vss_preselect(fd_set *rfds, fd_set *wfds, int *max_fileno)
{
int i;
- struct timeval *tv;
+ struct timeval now;
- para_fd_set(afs_socket, rfds, max_fileno);
- if (!map)
+ if (!map || vss_next() || vss_paused() || vss_repos())
for (i = 0; senders[i].name; i++)
senders[i].shutdown_clients();
- else {
- if (vss_next()) {
- vss_eof();
- tv = vss_compute_timeout();
- goto out;
- }
+ if (vss_next()) {
+ vss_eof();
+ goto out;
}
- if (vss_paused() || vss_repos()) {
- for (i = 0; senders[i].name; i++)
- senders[i].shutdown_clients();
- if (map) {
- struct timeval now;
+ if (vss_paused()) {
+ if (mmd->chunks_sent) {
gettimeofday(&now, NULL);
- if (!vss_paused() || mmd->chunks_sent)
- tv_add(&mmd->afd.afhi.eof_tv, &now, &eof_barrier);
- if (vss_repos())
- tv_add(&now, &announce_tv, &data_send_barrier);
+ tv_add(&mmd->afd.afhi.eof_tv, &now, &eof_barrier);
}
mmd->chunks_sent = 0;
+ goto out;
}
if (vss_repos()) {
- mmd->new_vss_status_flags &= ~(VSS_REPOS);
+ gettimeofday(&now, NULL);
+ tv_add(&now, &announce_tv, &data_send_barrier);
+ tv_add(&mmd->afd.afhi.eof_tv, &now, &eof_barrier);
+ mmd->chunks_sent = 0;
mmd->current_chunk = mmd->repos_request;
- }
- tv = vss_compute_timeout();
- if (tv)
- goto out;
- if (!map && vss_playing() &&
- !(mmd->new_vss_status_flags & VSS_NOMORE)) {
- if (afsss != AFS_SOCKET_AFD_PENDING) {
- 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;
- }
+ mmd->new_vss_status_flags &= ~VSS_REPOS;
}
out:
- return tv;
+ if (need_to_request_new_audio_file()) {
+ 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;
+ } else
+ para_fd_set(afs_socket, rfds, max_fileno);
+ return vss_compute_timeout();
}
static int recv_afs_msg(int *fd, uint32_t *code, uint32_t *data)
{
int ret;
- if (FD_ISSET(afs_socket, rfds))
- recv_afs_result();
- if (afsss != AFS_SOCKET_CHECK_FOR_WRITE || !FD_ISSET(afs_socket, wfds))
+ if (afsss != AFS_SOCKET_CHECK_FOR_WRITE) {
+ if (FD_ISSET(afs_socket, rfds))
+ recv_afs_result();
+ return;
+ }
+ if (!FD_ISSET(afs_socket, wfds))
return;
PARA_NOTICE_LOG("requesting new fd from afs\n");
ret = send_buffer(afs_socket, "new");
afsss = AFS_SOCKET_AFD_PENDING;
}
+
/**
* Get the data of the given chunk.
*
mmd->new_vss_status_flags &= ~VSS_REPOS;
if (mmd->current_chunk >= mmd->afd.afhi.chunks_total) { /* eof */
mmd->new_vss_status_flags |= VSS_NEXT;
- return vss_eof();
+ return;
}
/*
* We call the send function also in case of empty chunks as they