Abolish UAUDIO_DEFAULT

diff --git a/clients/playrtp.c b/clients/playrtp.c
index 4ea5e3b43bd782b1f8f72c83f61bdc4a72e815a0..03e4ad2e297de1a3c10601f3c8c3c6418953a234 100644 (file)
--- 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");
 
   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();
   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 92bf90f7df817b15e1a485e7765346abd4602290..119d6b6bef73d75f6cc923b87651a4b1b8928b7c 100644 (file)
--- 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;
 
 #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;
 #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;
 #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;
 #endif
 
 extern const struct uaudio uaudio_rtp;

-#ifndef UAUDIO_DEFAULT
-# define UAUDIO_DEFAULT uaudio_rtp
-#endif

 
 extern const struct uaudio uaudio_command;
 
 
 extern const struct uaudio uaudio_command;