* 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"
#ifdef HAVE_OGGVORBIS
void ogg_init(void *);
#endif
+#ifdef HAVE_FAAD
+ void aac_afh_init(void *);
+#endif
/**
* the list of supported audio formats
.name = "ogg",
.init = ogg_init,
},
+#endif
+#ifdef HAVE_FAAD
+ {
+ .name = "aac",
+ .init = aac_afh_init,
+ },
#endif
{
.name = NULL,
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]);
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_REPOS;
if (!buf) {