X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=vss.c;h=3b364a5b9f6c84265a41576867a7f58a08fff2f8;hp=826191bc100d5fb36bb9d0ed3482ff2dce36b21d;hb=a6e79f02b6eab623425686f8f3cab5bc942e77d4;hpb=dda5531a160fe43b35c8da5f6a149e4f9c561877 diff --git a/vss.c b/vss.c index 826191bc..3b364a5b 100644 --- a/vss.c +++ b/vss.c @@ -182,7 +182,6 @@ static void vss_eof(void) int i; char *tmp; - PARA_NOTICE_LOG("EOF\n"); if (!map) { for (i = 0; senders[i].name; i++) senders[i].shutdown_clients(); @@ -317,7 +316,7 @@ 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)) { - PARA_DEBUG_LOG("%s", "ready and playing, but no audio file\n"); + PARA_DEBUG_LOG("ready and playing, but no audio file\n"); if (afsss == AFS_SOCKET_READY) { para_fd_set(afs_socket, wfds, max_fileno); afsss = AFS_SOCKET_CHECK_FOR_WRITE; @@ -367,11 +366,10 @@ static void recv_afs_result(void) struct stat statbuf; struct timeval now; - PARA_NOTICE_LOG("recv\n"); ret = recv_afs_msg(&passed_fd, &afs_code, &afs_data); if (ret < 0) goto err; - PARA_NOTICE_LOG("got the fd: %d, code: %u, shmid: %u\n", + PARA_DEBUG_LOG("got the fd: %d, code: %u, shmid: %u\n", passed_fd, afs_code, afs_data); ret = -E_BAD_AFS_CODE; if (afs_code != NEXT_AUDIO_FILE) @@ -419,7 +417,7 @@ void vss_post_select(fd_set *rfds, fd_set *wfds) recv_afs_result(); if (afsss != AFS_SOCKET_CHECK_FOR_WRITE || !FD_ISSET(afs_socket, wfds)) return; - PARA_NOTICE_LOG("requesting new socket\n"); + PARA_NOTICE_LOG("requesting new fd from afs\n"); ret = send_buffer(afs_socket, "new"); afsss = AFS_SOCKET_AFD_PENDING; } @@ -429,10 +427,6 @@ static void get_chunk(long unsigned chunk_num, char **buf, size_t *len) size_t pos = mmd->afd.afhi.chunk_table[chunk_num]; *buf = map + pos; *len = mmd->afd.afhi.chunk_table[chunk_num + 1] - pos; - - if (chunk_num + 5 > mmd->afd.afhi.chunks_total) - PARA_NOTICE_LOG("chunk %lu/%lu\n, len: %zu\n", chunk_num, - mmd->afd.afhi.chunks_total, *len); } /**