# HG changeset patch
# User Chris Cannam
# Date 1169936134 0
# Node ID 76fa8f657038b07de51b5fdbae42cb0470debda9
# Parent  2678a1f132d2c82939f9ac9153646ab4f328952b
* Fix some v18/V18 inconsistencies

diff -r 2678a1f132d2 -r 76fa8f657038 audioio/AudioPortAudioTarget.cpp
--- a/audioio/AudioPortAudioTarget.cpp	Fri Jan 26 16:59:57 2007 +0000
+++ b/audioio/AudioPortAudioTarget.cpp	Sat Jan 27 22:15:34 2007 +0000
@@ -34,7 +34,7 @@
     PaError err;
 
 #ifdef DEBUG_AUDIO_PORT_AUDIO_TARGET
-#ifdef HAVE_PORTAUDIO_v18
+#ifdef HAVE_PORTAUDIO_V18
     std::cerr << "AudioPortAudioTarget: Initialising for PortAudio v18" << std::endl;
 #else
     std::cerr << "AudioPortAudioTarget: Initialising for PortAudio v19" << std::endl;
@@ -53,11 +53,11 @@
 	m_sampleRate = m_source->getSourceSampleRate();
     }
 
-#ifdef HAVE_PORTAUDIO_v18
+#ifdef HAVE_PORTAUDIO_V18
     m_latency = Pa_GetMinNumBuffers(m_bufferSize, m_sampleRate) * m_bufferSize;
 #endif
 
-#ifdef HAVE_PORTAUDIO_v18
+#ifdef HAVE_PORTAUDIO_V18
     err = Pa_OpenDefaultStream(&m_stream, 0, 2, paFloat32,
 			       m_sampleRate, m_bufferSize, 0,
 			       processStatic, this);
@@ -74,7 +74,7 @@
 	return;
     }
 
-#ifndef HAVE_PORTAUDIO_v18
+#ifndef HAVE_PORTAUDIO_V18
     const PaStreamInfo *info = Pa_GetStreamInfo(m_stream);
     m_latency = int(info->outputLatency * m_sampleRate + 0.001);
 #endif
@@ -124,7 +124,7 @@
     return (m_stream != 0);
 }
 
-#ifdef HAVE_PORTAUDIO_v18
+#ifdef HAVE_PORTAUDIO_V18
 int
 AudioPortAudioTarget::processStatic(void *input, void *output,
 				    unsigned long nframes,
@@ -152,7 +152,7 @@
     m_source->setTargetSampleRate(m_sampleRate);
 }
 
-#ifdef HAVE_PORTAUDIO_v18
+#ifdef HAVE_PORTAUDIO_V18
 int
 AudioPortAudioTarget::process(void *inputBuffer, void *outputBuffer,
 			      unsigned long nframes,