Refactor PortAudio backend

include/AudioDevice.h

@@ -113,6 +113,11 @@ class AudioDevice
 		m_sampleRate = _new_sr;
 	}
 
+	void setChannels(const ch_cnt_t channels)
+	{
+		m_channels = channels;
+	}
+
 	AudioEngine* audioEngine()
 	{
 		return m_audioEngine;

include/AudioPortAudio.h

@@ -25,137 +25,60 @@
 #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
-
-#endif
-
-
-namespace lmms
-{
-
-class AudioPortAudioSetupUtil : public QObject
-{
-Q_OBJECT
-public slots:
-	void updateBackends();
-	void updateDevices();
-	void updateChannels();
-
-public:
-	ComboBoxModel m_backendModel;
-	ComboBoxModel m_deviceModel;
-};
-
-
-#ifdef LMMS_HAVE_PORTAUDIO
-
-
-namespace gui
-{
-class ComboBox;
-class LcdSpinBox;
-}
+#include <QComboBox>
+#include <QFormLayout>
+#include <QString>
+#include <QWidget>
+#include <portaudio.h>
 
+#include "AudioDevice.h"
+#include "AudioDeviceSetupWidget.h"
 
+namespace lmms {
 class AudioPortAudio : public AudioDevice
 {
 public:
-	AudioPortAudio( bool & _success_ful, AudioEngine* audioEngine );
+	AudioPortAudio(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;
+	static auto name() -> QString { return QT_TRANSLATE_NOOP("AudioDeviceSetupWidget", "PortAudio"); }
 
-	} PaStreamParameters;
-#endif // PORTAUDIO_V19
-
-	PaStream * m_paStream;
-	PaStreamParameters m_outputParameters;
-	PaStreamParameters m_inputParameters;
+private:
+	static int processCallback(const void* input, void* output, unsigned long frameCount,
+		const PaStreamCallbackTimeInfo* timeInfo, PaStreamCallbackFlags statusFlags, void* userData);
 
-	bool m_wasPAInitError;
+	PaStream* m_paStream = nullptr;
+	std::vector<SampleFrame> m_outBuf;
+	std::size_t m_outBufPos = 0;
+};
+} // namespace lmms
 
-	SampleFrame* m_outBuf;
-	std::size_t m_outBufPos;
-	fpp_t m_outBufSize;
+namespace lmms::gui {
+class AudioPortAudioSetupWidget : public AudioDeviceSetupWidget
+{
+public:
+	AudioPortAudioSetupWidget(QWidget* parent);
+	~AudioPortAudioSetupWidget();
 
-	bool m_stopped;
+	void show() override;
+	void saveSettings() override;
 
-} ;
+private:
+	class DeviceSpecWidget;
+	QComboBox* m_backendComboBox = nullptr;
+	DeviceSpecWidget* m_inputDevice = nullptr;
+	DeviceSpecWidget* m_outputDevice = nullptr;
+	PaError m_portAudioInitError = paNoError;
+};
+} // namespace lmms::gui
 
 #endif // LMMS_HAVE_PORTAUDIO
 
-} // namespace lmms
-
 #endif // LMMS_AUDIO_PORTAUDIO_H

src/core/AudioEngine.cpp

@@ -23,6 +23,7 @@
  */
 
 #include "AudioEngine.h"
+#include <iostream>
 
 #include "MixHelpers.h"
 #include "denormals.h"
@@ -907,14 +908,23 @@ AudioDevice * AudioEngine::tryAudioDevices()
 
 
 #ifdef LMMS_HAVE_PORTAUDIO
-	if( dev_name == AudioPortAudio::name() || dev_name == "" )
+	// TODO: Eventually move all devices to use exception handling instead of passing in a boolean parameter
+	// to the constructor
+	try
 	{
-		dev = new AudioPortAudio( success_ful, this );
-		if( success_ful )
+		if (dev_name == AudioPortAudio::name() || dev_name == "")
 		{
+			dev = new AudioPortAudio(this);
 			m_audioDevName = AudioPortAudio::name();
 			return dev;
 		}
+
+		success_ful = true;
+	}
+	catch (std::runtime_error& error)
+	{
+		std::cerr << error.what() << '\n';
+		success_ful = false;
 		delete dev;
 	}
 #endif

src/gui/modals/SetupDialog.cpp

@@ -496,7 +496,7 @@ SetupDialog::SetupDialog(ConfigTab tab_to_open) :
 
 #ifdef LMMS_HAVE_PORTAUDIO
 	m_audioIfaceSetupWidgets[AudioPortAudio::name()] =
-			new AudioPortAudio::setupWidget(as_w);
+			new AudioPortAudioSetupWidget(as_w);
 #endif
 
 #ifdef LMMS_HAVE_SOUNDIO