From d6f7066e801d012306ca84b957fdaab7d49c77f1 Mon Sep 17 00:00:00 2001
From: Tim Mayberry <mojofunk@gmail.com>
Date: Sun, 23 Aug 2015 14:40:35 +1000
Subject: [PATCH] Remove apple specific fixes from PortaudioBackend now that it
 is windows only

---
 libs/backends/portaudio/portaudio_io.cc | 29 -------------------------
 1 file changed, 29 deletions(-)

diff --git a/libs/backends/portaudio/portaudio_io.cc b/libs/backends/portaudio/portaudio_io.cc
index 920929cd6b..add252926b 100644
--- a/libs/backends/portaudio/portaudio_io.cc
+++ b/libs/backends/portaudio/portaudio_io.cc
@@ -559,19 +559,6 @@ PortAudioIO::pcm_start()
 	return 0;
 }
 
-#ifdef __APPLE__
-static uint32_t lower_power_of_two (uint32_t v) {
-	v--;
-	v |= v >> 1;
-	v |= v >> 2;
-	v |= v >> 4;
-	v |= v >> 8;
-	v |= v >> 16;
-	v++;
-	return v >> 1;
-}
-#endif
-
 int
 PortAudioIO::pcm_setup (
 		int device_input, int device_output,
@@ -637,22 +624,6 @@ PortAudioIO::pcm_setup (
 		goto error;
 	}
 
-#ifdef __APPLE__
-	// pa_mac_core_blocking.c pa_stable_v19_20140130
-	// BUG: ringbuffer alloc requires power-of-two chn count.
-	if ((_capture_channels & (_capture_channels - 1)) != 0) {
-		DEBUG_AUDIO (
-		    "Adjusted capture channels to power of two (portaudio rb bug)\n");
-		_capture_channels = lower_power_of_two (_capture_channels);
-	}
-
-	if ((_playback_channels & (_playback_channels - 1)) != 0) {
-		DEBUG_AUDIO (
-		    "Adjusted capture channels to power of two (portaudio rb bug)\n");
-		_playback_channels = lower_power_of_two (_playback_channels);
-	}
-#endif
-
 	DEBUG_AUDIO (string_compose ("PortAudio Channels: in:%1 out:%2\n",
 	                             _capture_channels,
 	                             _playback_channels));