From 902ccab074b767f56385b36a6dc6161091527d4f Mon Sep 17 00:00:00 2001 Message-Id: <902ccab074b767f56385b36a6dc6161091527d4f.1714087028.git.mdw@distorted.org.uk> From: Mark Wooding Date: Tue, 3 Mar 2009 19:40:33 +0000 Subject: [PATCH] Abolish UAUDIO_DEFAULT Organization: Straylight/Edgeware From: Richard Kettlewell --- clients/playrtp.c | 2 +- lib/uaudio.h | 12 ------------ 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/clients/playrtp.c b/clients/playrtp.c index 4ea5e3b..03e4ad2 100644 --- a/clients/playrtp.c +++ b/clients/playrtp.c @@ -590,7 +590,7 @@ int main(int argc, char **argv) { mem_init(); if(!setlocale(LC_CTYPE, "")) fatal(errno, "error calling setlocale"); - backend = &UAUDIO_DEFAULT; + backend = uaudio_apis[0]; while((n = getopt_long(argc, argv, "hVdD:m:b:x:L:R:M:aocC:re:", options, 0)) >= 0) { switch(n) { case 'h': help(); diff --git a/lib/uaudio.h b/lib/uaudio.h index 92bf90f..119d6b6 100644 --- a/lib/uaudio.h +++ b/lib/uaudio.h @@ -112,29 +112,17 @@ extern int uaudio_schedule_reactivated; #if HAVE_COREAUDIO_AUDIOHARDWARE_H extern const struct uaudio uaudio_coreaudio; -#ifndef UAUDIO_DEFAULT -# define UAUDIO_DEFAULT uaudio_coreaudio -#endif #endif #if HAVE_ALSA_ASOUNDLIB_H extern const struct uaudio uaudio_alsa; -#ifndef UAUDIO_DEFAULT -# define UAUDIO_DEFAULT uaudio_alsa -#endif #endif #if HAVE_SYS_SOUNDCARD_H || EMPEG_HOST extern const struct uaudio uaudio_oss; -#ifndef UAUDIO_DEFAULT -# define UAUDIO_DEFAULT uaudio_oss -#endif #endif extern const struct uaudio uaudio_rtp; -#ifndef UAUDIO_DEFAULT -# define UAUDIO_DEFAULT uaudio_rtp -#endif extern const struct uaudio uaudio_command; -- [mdw]