X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=vss.c;h=fbe740a892b9108a6fa4ac5b78421c79f6bc3631;hp=4418c53a3080de42b393c9a856a1dd5727e03b74;hb=4df56926d10669ec120510957d3aa3fddb16e3c6;hpb=49a0c1671a71a796ed4c794003e3bb96320e863c diff --git a/vss.c b/vss.c index 4418c53a..fbe740a8 100644 --- a/vss.c +++ b/vss.c @@ -267,6 +267,10 @@ static enum afs_socket_status afsss; * 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 @@ -317,7 +321,8 @@ struct timeval *vss_preselect(fd_set *rfds, fd_set *wfds, int *max_fileno) 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; @@ -393,7 +398,6 @@ static void recv_afs_result(void) 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;