X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=afs.c;h=8e0a50aa90fd5547c80bf168236f76221f36e7bf;hp=cb6c3882266876d240ddaaf1fb857d7cda75dbeb;hb=db34194eaab9819772bd55ea1ab08c719ed8f1c8;hpb=2ed89c59f0efcd0a2763f47c7d3455663241e623

diff --git a/afs.c b/afs.c
index cb6c3882..8e0a50aa 100644
--- a/afs.c
+++ b/afs.c
@@ -18,14 +18,14 @@
 
 /** \file afs.c audio file sending functions
  *
- * This contains the audio sending part of para_server which is independent
- * of the current audio format, database tool and of the activated senders.
+ * This contains the audio sending part of para_server which is independent of
+ * the current audio format, audio file selector and of the activated senders.
  */
 
+#include "server.h"
 #include <sys/time.h> /* gettimeofday */
 #include "server.cmdline.h"
 #include "db.h"
-#include "server.h"
 #include "afs.h"
 #include "send.h"
 #include "error.h"
@@ -38,7 +38,7 @@ static struct timeval data_send_barrier;
 static struct timeval eof_barrier;
 
 extern struct misc_meta_data *mmd;
-extern struct dbtool dblist[];
+extern struct audio_file_selector selectors[];
 extern struct sender senders[];
 extern struct gengetopt_args_info conf;
 
@@ -51,11 +51,14 @@ static FILE *audio_file = NULL;
 #ifdef HAVE_OGGVORBIS
 	void ogg_init(void *);
 #endif
+#ifdef HAVE_FAAD
+	void aac_afh_init(void *);
+#endif
 
 /**
  * the list of supported  audio formats
  */
-struct audio_format afl[] = {
+struct audio_format_handler afl[] = {
 #if 1
 	{
 		.name = "mp3",
@@ -67,6 +70,12 @@ struct audio_format afl[] = {
 		.name = "ogg",
 		.init = ogg_init,
 	},
+#endif
+#ifdef HAVE_FAAD
+	{
+		.name = "aac",
+		.init = aac_afh_init,
+	},
 #endif
 	{
 		.name = NULL,
@@ -150,7 +159,7 @@ void afs_init(void)
 		afl[i].init(&afl[i]);
 	}
 	ms2tv(conf.announce_time_arg, &announce_tv);
-	PARA_INFO_LOG("announce timeval: %lu:%lu\n", announce_tv.tv_sec, announce_tv.tv_usec);
+	PARA_INFO_LOG("announce timeval: %lums\n", tv2ms(&announce_tv));
 	for (i = 0; senders[i].name; i++) {
 		PARA_NOTICE_LOG("initializing %s sender\n", senders[i].name);
 		senders[i].init(&senders[i]);
@@ -233,7 +242,7 @@ static int update_mmd(void)
 
 static void get_song(void)
 {
-	char **sl = dblist[mmd->dbt_num].get_audio_file_list(10);
+	char **sl = selectors[mmd->selector_num].get_audio_file_list(10);
 	int i;
 
 	if (!sl)
@@ -253,8 +262,8 @@ static void get_song(void)
 			continue;
 		}
 		mmd->num_played++;
-		if (dblist[mmd->dbt_num].update_audio_file)
-			dblist[mmd->dbt_num].update_audio_file(sl[i]);
+		if (selectors[mmd->selector_num].update_audio_file)
+			selectors[mmd->selector_num].update_audio_file(sl[i]);
 		PARA_DEBUG_LOG("%s", "success\n");
 		mmd->new_afs_status_flags &= (~AFS_NEXT);
 		gettimeofday(&now, NULL);
@@ -313,7 +322,7 @@ static struct timeval *afs_compute_timeout(void)
 	if (chk_barrier("eof", &now, &eof_barrier, &the_timeout, 1) < 0)
 		return &the_timeout;
 	if (chk_barrier("data send", &now, &data_send_barrier,
-			 &the_timeout, 1) < 0)
+			&the_timeout, 1) < 0)
 		return &the_timeout;
 	if (mmd->audio_format < 0 || !afs_playing() || !audio_file)
 		return NULL;
@@ -327,7 +336,7 @@ static struct timeval *afs_compute_timeout(void)
 	return &the_timeout;
 }
 
-static void afs_eof(struct audio_format *af)
+static void afs_eof(struct audio_format_handler *af)
 {
 	struct timeval now;
 	int i;
@@ -353,7 +362,7 @@ static void afs_eof(struct audio_format *af)
 	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->dbinfo, tmp);
+	strcpy(mmd->selector_info, tmp);
 	free(tmp);
 	mmd->filename[0] = '\0';
 	mmd->size = 0;
@@ -379,7 +388,7 @@ static void afs_eof(struct audio_format *af)
  */
 struct timeval *afs_preselect(void)
 {
-	struct audio_format *af = NULL;
+	struct audio_format_handler *af = NULL;
 	int i, format;
 	struct timeval *ret;
 again:
@@ -398,10 +407,9 @@ again:
 			senders[i].shutdown_clients();
 		if (af) {
 			struct timeval now;
-			if (!afs_paused() || mmd->chunks_sent) {
-				gettimeofday(&now, NULL);
+			gettimeofday(&now, NULL);
+			if (!afs_paused() || mmd->chunks_sent)
 				tv_add(&af->eof_tv, &now, &eof_barrier);
-			}
 			if (afs_repos())
 				tv_add(&now, &announce_tv, &data_send_barrier);
 			if (mmd->new_afs_status_flags & AFS_NOMORE)
@@ -415,7 +423,7 @@ again:
 		mmd->new_afs_status_flags &= ~(AFS_REPOS);
 		mmd->current_chunk = mmd->repos_request;
 	}
-	ret = afs_compute_timeout(); 
+	ret = afs_compute_timeout();
 	if (!ret && !audio_file && afs_playing() &&
 			!(mmd->new_afs_status_flags & AFS_NOMORE)) {
 		PARA_DEBUG_LOG("%s", "ready and playing, but no audio file\n");
@@ -441,7 +449,7 @@ again:
 void afs_send_chunk(void)
 {
 	int i;
-	struct audio_format *af;
+	struct audio_format_handler *af;
 	char *buf;
 	ssize_t ret;
 	struct timeval now, due;
@@ -453,8 +461,13 @@ void afs_send_chunk(void)
 	afs_next_chunk_time(&due);
 	if (tv_diff(&due, &now, NULL) > 0)
 		return;
+	if (chk_barrier("eof", &now, &eof_barrier, &due, 1) < 0)
+		return;
+	if (chk_barrier("data send", &now, &data_send_barrier,
+			&due, 1) < 0)
+		return;
 	buf = af->read_chunk(mmd->current_chunk, &ret);
-	mmd->new_afs_status_flags &= ~(AFS_NEXT | AFS_REPOS);
+	mmd->new_afs_status_flags &= ~AFS_REPOS;
 	if (!buf) {
 		if (ret < 0)
 			mmd->new_afs_status_flags = AFS_NEXT;