summaryrefslogtreecommitdiff
path: root/libs/backends/portaudio/portaudio_io.cc
diff options
context:
space:
mode:
authorTim Mayberry <mojofunk@gmail.com>2015-08-23 14:40:35 +1000
committerTim Mayberry <mojofunk@gmail.com>2015-09-02 12:07:14 +1000
commitd6f7066e801d012306ca84b957fdaab7d49c77f1 (patch)
treeb3bf6cb48c0bc9dc87db6694676dd33daf1ff838 /libs/backends/portaudio/portaudio_io.cc
parentdd93aec0296d417fe712b9f92bcdf81a17009574 (diff)
Remove apple specific fixes from PortaudioBackend now that it is windows only
Diffstat (limited to 'libs/backends/portaudio/portaudio_io.cc')
-rw-r--r--libs/backends/portaudio/portaudio_io.cc29
1 files changed, 0 insertions, 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));