comparison audioio/AudioPortAudioTarget.h @ 114:ccdc5b30e54c

* Remove PAv18 support, change PORTAUDIO to PORTAUDIO_2_0 throughout as
this is what comes from PAv19's pkgconfig module name

 */
 
 #ifndef _AUDIO_PORT_AUDIO_TARGET_H_
 #define _AUDIO_PORT_AUDIO_TARGET_H_
 
-#ifdef HAVE_PORTAUDIO
+#ifdef HAVE_PORTAUDIO_2_0
 
-// This code can be compiled for either PortAudio v18 or v19.
-// PortAudio v19 is the default.  If you want to use v18, define
-// the preprocessor symbol HAVE_PORTAUDIO_v18.
+// This code requires PortAudio v19 -- it won't work with v18.
 
 #include <portaudio.h>
 #include <vector>
+
+#include <QObject>
 
 #include "AudioCallbackPlayTarget.h"
 
 class AudioCallbackPlaySource;
 

 
 public slots:
     virtual void sourceModelReplaced();
 
 protected:
-#ifdef HAVE_PORTAUDIO_V18
-
-    int process(void *input, void *output, unsigned long frames,
-		PaTimestamp outTime);
-
-    static int processStatic(void *, void *, unsigned long,
-			     PaTimestamp, void *);
-
-    PortAudioStream *m_stream;
-
-#else
-
     int process(const void *input, void *output, unsigned long frames,
                 const PaStreamCallbackTimeInfo *timeInfo,
                 PaStreamCallbackFlags statusFlags);
 
     static int processStatic(const void *, void *, unsigned long,
                              const PaStreamCallbackTimeInfo *,
                              PaStreamCallbackFlags, void *);
 
     PaStream *m_stream;
-
-#endif
 
     int m_bufferSize;
     int m_sampleRate;
     int m_latency;
     bool m_done;