empeg integration

[disorder] / clients / playrtp.c

diff --git a/clients/playrtp.c b/clients/playrtp.c
index 1be801f53153bdf93054c7c7cb08cf79f632c6f9..cac7dcc3c53ddbc5c34c8afccbc6c88bf884ffa6 100644 (file)
--- a/clients/playrtp.c
+++ b/clients/playrtp.c
@@ -161,9 +161,9 @@ pthread_mutex_t lock = PTHREAD_MUTEX_INITIALIZER;
 /** @brief Condition variable signalled whenever @ref packets is changed */
 pthread_cond_t cond = PTHREAD_COND_INITIALIZER;
 
-#if API_ALSA
+#if HAVE_ALSA_ASOUNDLIB_H
 # define DEFAULT_BACKEND playrtp_alsa
-#elif HAVE_SYS_SOUNDCARD_H
+#elif HAVE_SYS_SOUNDCARD_H || EMPEG_HOST
 # define DEFAULT_BACKEND playrtp_oss
 #elif HAVE_COREAUDIO_AUDIOHARDWARE_H
 # define DEFAULT_BACKEND playrtp_coreaudio
@@ -186,10 +186,10 @@ static const struct option options[] = {
   { "buffer", required_argument, 0, 'b' },
   { "rcvbuf", required_argument, 0, 'R' },
   { "multicast", required_argument, 0, 'M' },
-#if HAVE_SYS_SOUNDCARD_H
+#if HAVE_SYS_SOUNDCARD_H || EMPEG_HOST
   { "oss", no_argument, 0, 'o' },
 #endif
-#if API_ALSA
+#if HAVE_ALSA_ASOUNDLIB_H
   { "alsa", no_argument, 0, 'a' },
 #endif
 #if HAVE_COREAUDIO_AUDIOHARDWARE_H
@@ -407,10 +407,10 @@ static void help(void) {
           "  --max, -x FRAMES        Buffer maximum size\n"
           "  --rcvbuf, -R BYTES      Socket receive buffer size\n"
           "  --multicast, -M GROUP   Join multicast group\n"
-#if API_ALSA
+#if HAVE_ALSA_ASOUNDLIB_H
           "  --alsa, -a              Use ALSA to play audio\n"
 #endif
-#if HAVE_SYS_SOUNDCARD_H
+#if HAVE_SYS_SOUNDCARD_H || EMPEG_HOST
           "  --oss, -o               Use OSS to play audio\n"
 #endif
 #if HAVE_COREAUDIO_AUDIOHARDWARE_H
@@ -466,16 +466,14 @@ int main(int argc, char **argv) {
     case 'L': logfp = fopen(optarg, "w"); break;
     case 'R': target_rcvbuf = atoi(optarg); break;
     case 'M': multicast_group = optarg; break;
-#if API_ALSA
+#if HAVE_ALSA_ASOUNDLIB_H
     case 'a': backend = playrtp_alsa; break;
 #endif
-#if 0
-#if HAVE_SYS_SOUNDCARD_H      
+#if HAVE_SYS_SOUNDCARD_H || EMPEG_HOST
     case 'o': backend = playrtp_oss; break;
 #endif
 #if HAVE_COREAUDIO_AUDIOHARDWARE_H      
     case 'c': backend = playrtp_coreaudio; break;
-#endif
 #endif
     default: fatal(0, "invalid option");
     }