Tim Mayberry : Allow portaudio driver to be compiled without ASIO.

windows/portaudio/JackPortAudioDevices.cpp

@@ -208,7 +208,7 @@ int PortAudioDevices::GetOutputDeviceFromName(const char* devicename, PaDeviceIn
 
 int PortAudioDevices::GetPreferredBufferSize(PaDeviceIndex id)
 {
-#ifdef WIN32
+#if defined(WIN32) && defined(HAVE_ASIO)
     /* ASIO specific latency information */
     if (Pa_GetHostApiInfo(fDeviceInfo[id]->hostApi)->type == paASIO) {
         long minLatency, maxLatency, preferredLatency, granularity;
@@ -261,7 +261,7 @@ void PortAudioDevices::DisplayDevicesNames()
         jack_info("Max inputs                  = %d", fDeviceInfo[id]->maxInputChannels);
         jack_info("Max outputs                 = %d", fDeviceInfo[id]->maxOutputChannels);
         
-    #ifdef WIN32
+    #if defined(WIN32) && defined(HAVE_ASIO)
         /* ASIO specific latency information */
         if (Pa_GetHostApiInfo(fDeviceInfo[id]->hostApi)->type == paASIO) {
             long minLatency, maxLatency, preferredLatency, granularity;

windows/portaudio/JackPortAudioDriver.cpp

@@ -273,6 +273,7 @@ int JackPortAudioDriver::Attach()
 
         const char* alias;
 
+#if defined(HAVE_ASIO)
         if (fInputDevice != paNoDevice && fPaDevices->GetHostFromDevice(fInputDevice) == "ASIO") {
             for (int i = 0; i < fCaptureChannels; i++) {
                 if (PaAsio_GetInputChannelName(fInputDevice, i, &alias) == paNoError) {
@@ -290,7 +291,7 @@ int JackPortAudioDriver::Attach()
                 }
             }
         }
-
+#endif
         return 0;
 
     } else {