Fix up PortAudio backend

include/AudioPortAudio.h

@@ -25,137 +25,74 @@
 #ifndef LMMS_AUDIO_PORTAUDIO_H
 #define LMMS_AUDIO_PORTAUDIO_H
 
-#include <QObject>
-
 #include "lmmsconfig.h"
-#include "ComboBoxModel.h"
 
 #ifdef LMMS_HAVE_PORTAUDIO
 
-#   include <portaudio.h>
-
-#   include "AudioDevice.h"
-#   include "AudioDeviceSetupWidget.h"
-
-#   if defined paNeverDropInput || defined paNonInterleaved
-#	    define PORTAUDIO_V19
-#   else
-#	    define PORTAUDIO_V18
-#   endif
+#include <QObject>
+#include <memory>
+#include <portaudio.h>
 
-#endif
+#include "AudioDevice.h"
+#include "AudioDeviceSetupWidget.h"
 
+class QComboBox;
 
 namespace lmms
 {
 
-class AudioPortAudioSetupUtil : public QObject
+namespace gui {
+
+class AudioPortAudioSetupWidget : public gui::AudioDeviceSetupWidget
 {
-Q_OBJECT
-public slots:
+public:
+	AudioPortAudioSetupWidget(QWidget* _parent);
+
 	void updateBackends();
 	void updateDevices();
 	void updateChannels();
 
-public:
-	ComboBoxModel m_backendModel;
-	ComboBoxModel m_deviceModel;
-};
-
-
-#ifdef LMMS_HAVE_PORTAUDIO
-
-
-namespace gui
-{
-class ComboBox;
-class LcdSpinBox;
-}
+	void saveSettings() override;
+	void show() override;
 
+private:
+	QComboBox* m_backendComboBox;
+	QComboBox* m_deviceComboBox;
+};
+} // namespace gui
 
 class AudioPortAudio : public AudioDevice
 {
 public:
-	AudioPortAudio( bool & _success_ful, AudioEngine* audioEngine );
+	AudioPortAudio(bool& successful, AudioEngine* engine);
 	~AudioPortAudio() override;
 
 	inline static QString name()
 	{
 		return QT_TRANSLATE_NOOP( "AudioDeviceSetupWidget", "PortAudio" );
 	}
 
-	int process_callback(const float* _inputBuffer, float* _outputBuffer, f_cnt_t _framesPerBuffer);
-
-	class setupWidget : public gui::AudioDeviceSetupWidget
-	{
-	public:
-		setupWidget( QWidget * _parent );
-		~setupWidget() override;
-
-		void saveSettings() override;
-		void show() override;
-
-	private:
-		gui::ComboBox * m_backend;
-		gui::ComboBox * m_device;
-		AudioPortAudioSetupUtil m_setupUtil;
-
-	} ;
-
 private:
 	void startProcessing() override;
 	void stopProcessing() override;
 
-#ifdef PORTAUDIO_V19
-	static int _process_callback( const void *_inputBuffer, void * _outputBuffer,
-		unsigned long _framesPerBuffer,
-		const PaStreamCallbackTimeInfo * _timeInfo,
-		PaStreamCallbackFlags _statusFlags,
-		void *arg );
-
-#else
-
-#define paContinue 0
-#define paComplete 1
-#define Pa_GetDeviceCount Pa_CountDevices
-#define Pa_GetDefaultInputDevice Pa_GetDefaultInputDeviceID
-#define Pa_GetDefaultOutputDevice Pa_GetDefaultOutputDeviceID
-#define Pa_IsStreamActive Pa_StreamActive
-
-	static int _process_callback( void * _inputBuffer, void * _outputBuffer,
-		unsigned long _framesPerBuffer, PaTimestamp _outTime, void * _arg );
-
-
-	using PaTime = double;
-	using PaDeviceIndex = PaDeviceID;
-
-	using PaStreamParameters = struct
-	{
-		PaDeviceIndex device;
-		int channelCount;
-		PaSampleFormat sampleFormat;
-		PaTime suggestedLatency;
-		void *hostApiSpecificStreamInfo;
-
-	} PaStreamParameters;
-#endif // PORTAUDIO_V19
+	int processCallback(const float* inputBuffer, float* outputBuffer, f_cnt_t framesPerBuffer);
+	static int processCallback(const void* inputBuffer, void* outputBuffer, unsigned long framesPerBuffer,
+		const PaStreamCallbackTimeInfo* timeInfo, PaStreamCallbackFlags statusFlags, void* arg);
 
 	PaStream * m_paStream;
 	PaStreamParameters m_outputParameters;
 	PaStreamParameters m_inputParameters;
 
 	bool m_wasPAInitError;
 
-	SampleFrame* m_outBuf;
+	std::unique_ptr<SampleFrame[]> m_outBuf;
 	std::size_t m_outBufPos;
 	fpp_t m_outBufSize;
+};
 
-	bool m_stopped;
-
-} ;
+} // namespace lmms
 
 #endif // LMMS_HAVE_PORTAUDIO
 
-} // namespace lmms
-
 #endif // LMMS_AUDIO_PORTAUDIO_H