Merge commit 'ad0c0f361be0'

diff --git a/.gitignore b/.gitignore
index 740a568..2e8cf69 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -206,3 +206,4 @@ disobedience/manual/Makefile
 /m4
 libtests/t-timeval
 *.[oa]
+*~

diff --git a/clients/playrtp.c b/clients/playrtp.c
index 2ab6790..2bd2452 100644 (file)
--- a/clients/playrtp.c
+++ b/clients/playrtp.c
@@ -678,6 +678,12 @@ int main(int argc, char **argv) {
     }
   }
   if(config_read(0, NULL)) disorder_fatal(0, "cannot read configuration");
+  if(backend == &uaudio_rtp) {
+    /* This means that you have NO local sound output.  This can happen if you
+     * use a non-Apple GCC on a Mac (because it doesn't know how to compile
+     * CoreAudio/AudioHardware.h). */
+    disorder_fatal(0, "cannot play RTP through RTP");
+  }
   if(!maxbuffer)
     maxbuffer = 2 * minbuffer;
   argc -= optind;