X-Git-Url: https://git.distorted.org.uk/~mdw/disorder/blobdiff_plain/4dadf1a26a3a9b619f7d91cbc435c7d9429d64d3..28f1495aaaf9ba4f1412aa006a5d48b7cf0d71db:/clients/playrtp.c?ds=sidebyside
diff --git a/clients/playrtp.c b/clients/playrtp.c
index b79e14d..aca1532 100644
--- a/clients/playrtp.c
+++ b/clients/playrtp.c
@@ -1,21 +1,19 @@
/*
* 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
+ * 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
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
+ * along with this program. If not, see .
*/
/** @file clients/playrtp.c
* @brief RTP player
@@ -49,12 +47,9 @@
* - it is safe to read uint32_t values without a lock protecting them
*/
-#include
-#include "types.h"
+#include "common.h"
#include
-#include
-#include
#include
#include
#include
@@ -62,8 +57,6 @@
#include
#include
#include
-#include
-#include
#include
#include
#include
@@ -175,18 +168,16 @@ pthread_mutex_t lock = PTHREAD_MUTEX_INITIALIZER;
/** @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);
@@ -406,6 +397,9 @@ static void *listen_thread(void attribute((unused)) *arg) {
timestamp, next_timestamp);
continue;
}
+ /* Ignore packets with the extension bit set. */
+ if(header.vpxcc & 0x10)
+ continue;
p->next = 0;
p->flags = 0;
p->timestamp = timestamp;
@@ -556,14 +550,10 @@ int main(int argc, char **argv) {
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();