X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=vss.c;h=963d311b05bacf18660742d3d2dbfd4290fa54d4;hp=3d54f16cc0e6911f26ed9500832540f0b164a273;hb=b3ee0fa979a74e9d7a1497ec5a3ac8fa7cc7472b;hpb=94e85c0e9e9493004b9b1ce3f3b1c78fd2d682be

diff --git a/vss.c b/vss.c
index 3d54f16c..963d311b 100644
--- a/vss.c
+++ b/vss.c
@@ -24,7 +24,6 @@
 #include "server.h"
 #include "net.h"
 #include "server.cmdline.h"
-#include "afs_common.h"
 #include "vss.h"
 #include "send.h"
 #include "ipc.h"
@@ -38,10 +37,8 @@ static struct timeval eof_barrier;
 static struct timeval autoplay_barrier;
 
 extern struct misc_meta_data *mmd;
-extern struct audio_file_selector selectors[];
 extern struct sender senders[];
 
-static int audio_file;
 static char *map;
 
 /**
@@ -103,7 +100,6 @@ void vss_init(void)
 			conf.announce_time_arg : 300,
 		autoplay_delay = conf.autoplay_delay_arg > 0?
 			conf.autoplay_delay_arg : 0;
-	afh_init();
 	ms2tv(announce_time, &announce_tv);
 	PARA_INFO_LOG("announce timeval: %lums\n", tv2ms(&announce_tv));
 	for (i = 0; senders[i].name; i++) {
@@ -140,7 +136,7 @@ static void vss_next_chunk_time(struct timeval *due)
 {
 	struct timeval tmp;
 
-	tv_scale(mmd->chunks_sent, &mmd->afi.chunk_tv, &tmp);
+	tv_scale(mmd->chunks_sent, &mmd->afd.afhi.chunk_tv, &tmp);
 	tv_add(&tmp, &mmd->stream_start, due);
 }
 
@@ -153,7 +149,7 @@ static struct timeval *vss_compute_timeout(void)
 	static struct timeval the_timeout;
 	struct timeval now, next_chunk;
 
-	if (vss_next() && mmd->audio_format >= 0) {
+	if (vss_next() && map) {
 		/* only sleep a bit, nec*/
 		the_timeout.tv_sec = 0;
 		the_timeout.tv_usec = 100;
@@ -168,11 +164,11 @@ static struct timeval *vss_compute_timeout(void)
 	if (chk_barrier("data send", &now, &data_send_barrier,
 			&the_timeout, 1) < 0)
 		return &the_timeout;
-	if (mmd->audio_format < 0 || !vss_playing() || !map)
+	if (!vss_playing() || !map)
 		return NULL;
 	vss_next_chunk_time(&next_chunk);
-	if (chk_barrier(audio_format_name(mmd->audio_format), &now, &next_chunk,
-			&the_timeout, 0) < 0)
+	if (chk_barrier(audio_format_name(mmd->afd.afsi.audio_format_id),
+			&now, &next_chunk, &the_timeout, 0) < 0)
 		return &the_timeout;
 	/* chunk is due or bof */
 	the_timeout.tv_sec = 0;
@@ -186,32 +182,29 @@ 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();
 		return;
 	}
 	gettimeofday(&now, NULL);
-	tv_add(&mmd->afi.eof_tv, &now, &eof_barrier);
+	tv_add(&mmd->afd.afhi.eof_tv, &now, &eof_barrier);
 	munmap(map, mmd->size);
 	map = NULL;
-	close(audio_file);
-	mmd->audio_format = -1;
 	mmd->chunks_sent = 0;
 	mmd->offset = 0;
-	mmd->afi.seconds_total = 0;
-	free(mmd->afi.chunk_table);
-	mmd->afi.chunk_table = NULL;
+	mmd->afd.afhi.seconds_total = 0;
+	free(mmd->afd.afhi.chunk_table);
+	mmd->afd.afhi.chunk_table = NULL;
 	tmp  = make_message("%s:\n%s:\n%s:\n", status_item_list[SI_AUDIO_INFO1],
 		status_item_list[SI_AUDIO_INFO2], status_item_list[SI_AUDIO_INFO3]);
-	strcpy(mmd->afi.info_string, tmp);
+	strcpy(mmd->afd.afhi.info_string, tmp);
 	free(tmp);
-	tmp  = make_message("%s:\n%s:\n%s:\n", status_item_list[SI_DBINFO1],
-		status_item_list[SI_DBINFO2], status_item_list[SI_DBINFO3]);
-	strcpy(mmd->selector_info, tmp);
-	free(tmp);
-	mmd->filename[0] = '\0';
+	mmd->afd.path[0] = '\0';
+	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++;
 }
@@ -228,10 +221,10 @@ static void vss_eof(void)
  */
 char *vss_get_header(size_t *header_len)
 {
-	if (mmd->audio_format < 0 || !map || !mmd->afi.header_len)
+	if (!map || !mmd->afd.afhi.header_len)
 		return NULL;
-	*header_len = mmd->afi.header_len;
-	return map + mmd->afi.header_offset;
+	*header_len = mmd->afd.afhi.header_len;
+	return map + mmd->afd.afhi.header_offset;
 }
 
 /**
@@ -254,9 +247,9 @@ const char *supported_audio_formats(void)
  */
 struct timeval *vss_chunk_time(void)
 {
-	if (mmd->audio_format < 0)
+	if (!map)
 		return NULL;
-	return &mmd->afi.chunk_tv;
+	return &mmd->afd.afhi.chunk_tv;
 }
 
 enum afs_socket_status {
@@ -306,7 +299,7 @@ struct timeval *vss_preselect(fd_set *rfds, fd_set *wfds, int *max_fileno)
 			struct timeval now;
 			gettimeofday(&now, NULL);
 			if (!vss_paused() || mmd->chunks_sent)
-				tv_add(&mmd->afi.eof_tv, &now, &eof_barrier);
+				tv_add(&mmd->afd.afhi.eof_tv, &now, &eof_barrier);
 			if (vss_repos())
 				tv_add(&now, &announce_tv, &data_send_barrier);
 			if (mmd->new_vss_status_flags & VSS_NOMORE)
@@ -373,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)
@@ -392,6 +384,7 @@ static void recv_afs_result(void)
 		mmd->afd.afhi.chunks_total);
 	ret = fstat(passed_fd, &statbuf);
 	if (ret < 0) {
+		PARA_ERROR_LOG("fstat error:\n");
 		ret = -ERRNO_TO_PARA_ERROR(errno);
 		goto err;
 	}
@@ -399,15 +392,13 @@ static void recv_afs_result(void)
 	mmd->mtime = statbuf.st_mtime;
 	map = para_mmap(mmd->size, PROT_READ, MAP_PRIVATE,
 		passed_fd, 0);
-	strcpy(mmd->filename, mmd->afd.path); /* FIXME: check length */
-	mmd->afi.header_len = 0; /* default: no header */
-	mmd->audio_format = mmd->afd.afsi.audio_format_id;
+	close(passed_fd);
+	mmd->afd.afhi.header_len = 0; /* default: no header */
 	mmd->chunks_sent = 0;
 	mmd->current_chunk = 0;
 	mmd->offset = 0;
 	mmd->events++;
 	mmd->num_played++;
-	mmd->afi = mmd->afd.afhi;
 	mmd->new_vss_status_flags &= (~VSS_NEXT);
 	gettimeofday(&now, NULL);
 	tv_add(&now, &announce_tv, &data_send_barrier);
@@ -426,20 +417,16 @@ 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;
 }
 
 static void get_chunk(long unsigned chunk_num, char **buf, size_t *len)
 {
-	size_t pos = mmd->afi.chunk_table[chunk_num];
+	size_t pos = mmd->afd.afhi.chunk_table[chunk_num];
 	*buf = map + pos;
-	*len = mmd->afi.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);
+	*len = mmd->afd.afhi.chunk_table[chunk_num + 1] - pos;
 }
 
 /**
@@ -453,9 +440,9 @@ static void get_chunk(long unsigned chunk_num, char **buf, size_t *len)
  */
 int vss_get_chunk(long unsigned chunk_num, char **buf, size_t *len)
 {
-	if (mmd->audio_format < 0 || !map || !vss_playing())
+	if (!map || !vss_playing())
 		return -E_CHUNK;
-	if (chunk_num >= mmd->afi.chunks_total)
+	if (chunk_num >= mmd->afd.afhi.chunks_total)
 		return -E_CHUNK;
 	get_chunk(chunk_num, buf, len);
 	return 1;
@@ -477,7 +464,7 @@ void vss_send_chunk(void)
 	char *buf;
 	size_t len;
 
-	if (mmd->audio_format < 0 || !map || !vss_playing())
+	if (!map || !vss_playing())
 		return;
 	gettimeofday(&now, NULL);
 	vss_next_chunk_time(&due);
@@ -489,7 +476,7 @@ void vss_send_chunk(void)
 			&due, 1) < 0)
 		return;
 	mmd->new_vss_status_flags &= ~VSS_REPOS;
-	if (mmd->current_chunk >= mmd->afi.chunks_total) { /* eof */
+	if (mmd->current_chunk >= mmd->afd.afhi.chunks_total) { /* eof */
 		mmd->new_vss_status_flags |= VSS_NEXT;
 		return vss_eof();
 	}
@@ -500,7 +487,7 @@ void vss_send_chunk(void)
 	if (!mmd->chunks_sent) {
 		struct timeval tmp;
 		gettimeofday(&mmd->stream_start, NULL);
-		tv_scale(mmd->current_chunk, &mmd->afi.chunk_tv, &tmp);
+		tv_scale(mmd->current_chunk, &mmd->afd.afhi.chunk_tv, &tmp);
 		mmd->offset = tv2ms(&tmp);
 		mmd->events++;
 	}