/*
* This file is part of DisOrder.
- * Copyright (C) 2007 Richard Kettlewell
+ * Copyright (C) 2007, 2008 Richard Kettlewell
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
#include "client.h"
#include "playrtp.h"
#include "inputline.h"
+#include "version.h"
#define readahead linux_headers_are_borked
/** @brief Condition variable signalled whenever @ref packets is changed */
pthread_cond_t cond = PTHREAD_COND_INITIALIZER;
-#if HAVE_ALSA_ASOUNDLIB_H
-# define DEFAULT_BACKEND playrtp_alsa
-#elif HAVE_SYS_SOUNDCARD_H || EMPEG_HOST
-# define DEFAULT_BACKEND playrtp_oss
-#elif HAVE_COREAUDIO_AUDIOHARDWARE_H
-# define DEFAULT_BACKEND playrtp_coreaudio
-#else
-# error No known backend
+#if DEFAULT_BACKEND == BACKEND_ALSA
+# define DEFAULT_PLAYRTP_BACKEND playrtp_alsa
+#elif DEFAULT_BACKEND == BACKEND_OSS
+# define DEFAULT_PLAYRTP_BACKEND playrtp_oss
+#elif DEFAULT_BACKEND == BACKEND_COREAUDIO
+# define DEFAULT_PLAYRTP_BACKEND playrtp_coreaudio
#endif
/** @brief Backend to play with */
-static void (*backend)(void) = &DEFAULT_BACKEND;
+static void (*backend)(void) = DEFAULT_PLAYRTP_BACKEND;
HEAP_DEFINE(pheap, struct packet *, lt_packet);
for(;;) {
/* Get the next packet */
pthread_mutex_lock(&receive_lock);
- while(!received_packets)
+ while(!received_packets) {
pthread_cond_wait(&receive_cond, &receive_lock);
+ }
p = received_packets;
received_packets = p->next;
if(!received_packets)
* out of order then we guarantee dropouts. But for now... */
if(nsamples >= maxbuffer) {
pthread_mutex_lock(&lock);
- while(nsamples >= maxbuffer)
+ while(nsamples >= maxbuffer) {
pthread_cond_wait(&cond, &lock);
+ }
pthread_mutex_unlock(&lock);
}
/* Add the packet to the receive queue */
while(nsamples)
drop_first_packet();
info("Buffering...");
- while(nsamples < readahead)
+ while(nsamples < readahead) {
pthread_cond_wait(&cond, &lock);
+ }
next_timestamp = pheap_first(&packets)->timestamp;
active = 1;
}
exit(0);
}
-/* display version number and terminate */
-static void version(void) {
- xprintf("disorder-playrtp version %s\n", disorder_version_string);
- xfclose(stdout);
- exit(0);
-}
-
int main(int argc, char **argv) {
int n, err;
struct addrinfo *res;
const char *dumpfile = 0;
static const struct addrinfo prefs = {
- AI_PASSIVE,
- PF_INET,
- SOCK_DGRAM,
- IPPROTO_UDP,
- 0,
- 0,
- 0,
- 0
+ .ai_flags = AI_PASSIVE,
+ .ai_family = PF_INET,
+ .ai_socktype = SOCK_DGRAM,
+ .ai_protocol = IPPROTO_UDP
};
mem_init();
while((n = getopt_long(argc, argv, "hVdD:m:b:x:L:R:M:aocC:r", options, 0)) >= 0) {
switch(n) {
case 'h': help();
- case 'V': version();
+ case 'V': version("disorder-playrtp");
case 'd': debugging = 1; break;
case 'D': device = optarg; break;
case 'm': minbuffer = 2 * atol(optarg); break;