X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=vss.c;h=1ec0b5db8604415af3b90ad8cc93bbc892727173;hp=aab051690fd9d9d4e0f71394e99f056c70f6f3c9;hb=5388ccac44e5342917ad50b091e9e4f906e3a4fc;hpb=00581ce02d1b5391569c8f3fc7739274b31bacf8 diff --git a/vss.c b/vss.c index aab05169..1ec0b5db 100644 --- a/vss.c +++ b/vss.c @@ -205,7 +205,6 @@ static void vss_eof(void) 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++; } @@ -321,7 +320,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; @@ -397,7 +397,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;