From be2efc62a506632ff8496602fa26c4b0c5f365c9 Mon Sep 17 00:00:00 2001
From: Rakuraku Jyo <jyo.rakuraku@gmail.com>
Date: Mon, 11 Apr 2011 22:46:32 +0900
Subject: [PATCH] update INSTALL for mac

---
 INSTALL     | 17 ++++++-----
 Makefile    |  3 +-
 hairtunes.c | 81 ++++-------------------------------------------------
 3 files changed, 17 insertions(+), 84 deletions(-)

diff --git a/INSTALL b/INSTALL
index 9a9016a0..3930a692 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,11 +1,14 @@
 Type 'make' to build the packet decoder, 'hairtunes'.
+
 You need the following installed:
+  openssl
+  libao (if you use homebrew, use brew install libao)
+  avahi (avahi-daemon running and avahi-publish-service on path, no need on Mac OSX)
+  Perl
 
-openssl
-libao
-avahi (avahi-daemon running and avahi-publish-service on path)
-Perl
+Debian/Ubuntu users need:
+  libssl-dev libcrypt-openssl-rsa-perl libao2 libao-dev2
 
-Perl modules (install from CPAN):
-HTTP::Message
-Crypt::OpenSSL::RSA
+Perl modules (install from CPAN if needed):
+  HTTP::Message
+  Crypt::OpenSSL::RSA (cpan, then install)
diff --git a/Makefile b/Makefile
index c1263552..8ec08596 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,4 @@
-CFLAGS = `pkg-config --cflags --libs openssl` -lportaudio
-#CFLAGS = `pkg-config --cflags --libs openssl ao` -DHAVE_AO
+CFLAGS = `pkg-config --cflags --libs ao openssl`
 
 hairtunes: hairtunes.c alac.c
 	gcc hairtunes.c alac.c -D__i386 -lm $(CFLAGS) -o hairtunes
diff --git a/hairtunes.c b/hairtunes.c
index b348366c..efe087a6 100644
--- a/hairtunes.c
+++ b/hairtunes.c
@@ -33,11 +33,7 @@
 #include <netinet/in.h>
 #include <pthread.h>
 #include <openssl/aes.h>
-#if HAVE_AO
 #include <ao/ao.h>
-#else
-#include <portaudio.h>
-#endif
 #include <math.h>
 
 #ifdef FANCY_RESAMPLING
@@ -237,8 +233,6 @@ int main(int argc, char **argv) {
     }
     fprintf(stderr, "bye!\n");
     fflush(stderr);
-	
-	uninit_output();
 }
 
 void init_buffer(void) {
@@ -589,11 +583,7 @@ int stuff_buffer(double playback_rate, short *inptr, short *outptr) {
 }
 
 void *audio_thread_func(void *arg) {
-#if HAVE_AO
-    ao_device* dev = arg;
-#else
-	PaStream* stream = arg;
-#endif
+    ao_device *dev = arg;
     int i, play_samples;
 
     signed short buf_fill;
@@ -636,74 +626,25 @@ void *audio_thread_func(void *arg) {
 #endif
             play_samples = stuff_buffer(bf_playback_rate, inbuf, outbuf);
 
-#if HAVE_AO		
         ao_play(dev, (char *)outbuf, play_samples*4);
-#else
-		int err = Pa_WriteStream(stream, (char *)outbuf, play_samples*4);
-		if( err != paNoError ) {
-			printf(  "PortAudio error: %s\n", Pa_GetErrorText( err ) );
-			exit(1);
-		}
-#endif
     }
 }
 
-#define NUM_CHANNELS 2
-
 int init_output(void) {
-    int err;
-#if HAVE_AO
     ao_initialize();
     int driver = ao_default_driver_id();
 
     ao_sample_format fmt;
+    memset(&fmt, 0, sizeof(fmt));
+
     fmt.bits = 16;
     fmt.rate = sampling_rate;
-    fmt.channels = NUM_CHANNELS;
+    fmt.channels = 2;
     fmt.byte_format = AO_FMT_LITTLE;
-//    fmt.matrix = 0;
     
     ao_device *dev = ao_open_live(driver, &fmt, 0);
-	void* arg = dev;
-#else
-	err = Pa_Initialize();
-	if( err != paNoError ) {
-		printf(  "PortAudio error: %s\n", Pa_GetErrorText( err ) );
-		exit(1);
-	}
 
-	PaStreamParameters outputParameters;
-	outputParameters.device = Pa_GetDefaultOutputDevice(); /* default output device */
-    outputParameters.channelCount = NUM_CHANNELS;
-    outputParameters.sampleFormat = paInt16;
-    outputParameters.suggestedLatency = Pa_GetDeviceInfo( outputParameters.device )->defaultHighOutputLatency;
-    outputParameters.hostApiSpecificStreamInfo = NULL;
-	
-    /* -- setup stream -- */
-	PaStream* stream = NULL;
-    err = Pa_OpenStream(
-						&stream,
-						NULL,
-						&outputParameters,
-						sampling_rate,
-						OUTFRAME_BYTES,
-						paClipOff,      /* we won't output out of range samples so don't bother clipping them */
-						NULL, /* no callback, use blocking API */
-						NULL ); /* no callback, so no callback userData */
-    if( err != paNoError ) {
-		printf(  "PortAudio error: %s\n", Pa_GetErrorText( err ) );
-		exit(1);
-	}
-	
-	err = Pa_StartStream( stream );
-    if( err != paNoError ) {
-		printf(  "PortAudio error: %s\n", Pa_GetErrorText( err ) );
-		exit(1);
-	}
-	
-	void* arg = stream;
-#endif
-	
+    int err;
 #ifdef FANCY_RESAMPLING
     if (fancy_resampling)
         src = src_new(SRC_SINC_MEDIUM_QUALITY, 2, &err);
@@ -712,15 +653,5 @@ int init_output(void) {
 #endif
 
     pthread_t audio_thread;
-    pthread_create(&audio_thread, NULL, audio_thread_func, arg);
-}
-
-int uninit_output(void) {
-#if HAVE_AO
-#else
-	int err = Pa_Terminate();
-	if( err != paNoError )
-		printf(  "PortAudio error: %s\n", Pa_GetErrorText( err ) );	
-#endif
-	return 0;
+    pthread_create(&audio_thread, NULL, audio_thread_func, dev);
 }