X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=vss.c;h=1be4cd15d1db262dd5f79a43b19e7bba09f2087a;hp=d74cec3ccf7f8feffbf92382ccfc26ac491d50c1;hb=cd8aecdb81f2ffb1a6e34a866d6156f8c915a467;hpb=2abba90245f87fab096edfc3faf7df61646b713f

diff --git a/vss.c b/vss.c
index d74cec3c..1be4cd15 100644
--- a/vss.c
+++ b/vss.c
@@ -143,14 +143,6 @@ static int chk_barrier(const char *bname, const struct timeval *now,
 	return -1;
 }
 
-static void vss_next_chunk_time(struct timeval *due)
-{
-	struct timeval tmp;
-
-	tv_scale(mmd->chunks_sent, &mmd->afd.afhi.chunk_tv, &tmp);
-	tv_add(&tmp, &mmd->stream_start, due);
-}
-
 /*
  * != NULL: timeout for next chunk
  * NULL: nothing to do
@@ -177,7 +169,8 @@ static struct timeval *vss_compute_timeout(void)
 		return &the_timeout;
 	if (!vss_playing() || !map)
 		return NULL;
-	vss_next_chunk_time(&next_chunk);
+	compute_chunk_time(mmd->chunks_sent, &mmd->afd.afhi.chunk_tv,
+		&mmd->stream_start, &next_chunk);
 	if (chk_barrier("chunk", &now, &next_chunk, &the_timeout, 0) < 0)
 		return &the_timeout;
 	/* chunk is due or bof */
@@ -222,19 +215,14 @@ static void vss_eof(void)
 /**
  * Get the header of the current audio file.
  *
- * \param header_len The length of the header is stored here.
- *
- * \return A pointer to a buffer containing the header, or NULL, if no audio
- * file is selected or if the current audio format does not need special header
- * treamtment.
+ * \param buf The length of the header is stored here.
+ * \param len Points to a buffer containing the header on return.
  *
+ * \sa afh_get_header.
  */
-char *vss_get_header(size_t *header_len)
+void vss_get_header(char **buf, size_t *len)
 {
-	if (!map || !mmd->afd.afhi.header_len)
-		return NULL;
-	*header_len = mmd->afd.afhi.header_len;
-	return map + mmd->afd.afhi.header_offset;
+	afh_get_header(&mmd->afd.afhi, map, buf, len);
 }
 
 /**
@@ -363,7 +351,7 @@ static int recv_afs_msg(int *fd, uint32_t *code, uint32_t *data)
 		return -ERRNO_TO_PARA_ERROR(errno);
 	afsss = AFS_SOCKET_READY;
 	if (iov.iov_len != sizeof(buf))
-		return -E_SHORT_AFS_READ;
+		return -E_AFS_SHORT_READ;
 	*code = *(uint32_t*)buf;
 	*data =  *(uint32_t*)(buf + 4);
 	for (cmsg = CMSG_FIRSTHDR(&msg); cmsg; cmsg = CMSG_NXTHDR(&msg, cmsg)) {
@@ -440,14 +428,6 @@ void vss_post_select(fd_set *rfds, fd_set *wfds)
 	ret = send_buffer(afs_socket, "new");
 	afsss = AFS_SOCKET_AFD_PENDING;
 }
-
-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;
-}
-
 /**
  * Get the data of the given chunk.
  *
@@ -463,7 +443,7 @@ int vss_get_chunk(long unsigned chunk_num, char **buf, size_t *len)
 		return -E_CHUNK;
 	if (chunk_num >= mmd->afd.afhi.chunks_total)
 		return -E_CHUNK;
-	get_chunk(chunk_num, buf, len);
+	afh_get_chunk(chunk_num, &mmd->afd.afhi, map, buf, len);
 	return 1;
 }
 
@@ -486,7 +466,8 @@ void vss_send_chunk(void)
 	if (!map || !vss_playing())
 		return;
 	gettimeofday(&now, NULL);
-	vss_next_chunk_time(&due);
+	compute_chunk_time(mmd->chunks_sent, &mmd->afd.afhi.chunk_tv,
+		&mmd->stream_start, &due);
 	if (tv_diff(&due, &now, NULL) > 0)
 		return;
 	if (chk_barrier("eof", &now, &eof_barrier, &due, 1) < 0)
@@ -510,7 +491,7 @@ void vss_send_chunk(void)
 		mmd->offset = tv2ms(&tmp);
 		mmd->events++;
 	}
-	get_chunk(mmd->current_chunk, &buf, &len);
+	afh_get_chunk(mmd->current_chunk, &mmd->afd.afhi, map, &buf, &len);
 	for (i = 0; senders[i].name; i++)
 		senders[i].send(mmd->current_chunk, mmd->chunks_sent, buf, len);
 	mmd->new_vss_status_flags |= VSS_PLAYING;