Improved controls with menus

audiodevice.cpp

@@ -3,6 +3,7 @@
 // Qt includes
 #include <QIODevice>
 #include <QAudioInput>
+#include <QDebug>
 
 namespace {
 //! private helper to allow QAudioInput to write to a io device
@@ -10,6 +11,7 @@ class AudioDeviceHelper : public QIODevice
 {
 public:
     explicit AudioDeviceHelper(AudioDevice &audioDevice);
+    ~AudioDeviceHelper();
 
     qint64 readData(char *data, qint64 maxlen) override;
     qint64 writeData(const char *data, qint64 len) override;
@@ -17,11 +19,26 @@ public:
 private:
     AudioDevice &m_audioDevice;
 };
+
+struct AudioDevicePrivate {
+    AudioDevicePrivate(AudioDevice &audioDevice, const QAudioDeviceInfo &audioDeviceInfo, const QAudioFormat &format) :
+        helper(audioDevice), input(audioDeviceInfo, format)
+    {
+        qDebug() << audioDeviceInfo.deviceName();
+    }
+
+    ~AudioDevicePrivate()
+    {
+        qDebug() << "called";
+    }
+
+    AudioDeviceHelper helper;
+    QAudioInput input;
+};
 }
 
 AudioDevice::AudioDevice(QObject *parent) :
-    BaseDevice{parent},
-    m_helper(std::make_unique<AudioDeviceHelper>(*this))
+    BaseDevice{parent}
 {
 }
 
@@ -29,6 +46,8 @@ AudioDevice::~AudioDevice() = default;
 
 void AudioDevice::start()
 {
+    qDebug() << m_device.deviceName();
+
     QAudioFormat format;
     format.setSampleRate(m_samplerate);
     format.setChannelCount(2);
@@ -37,14 +56,15 @@ void AudioDevice::start()
     format.setCodec("audio/pcm");
     format.setByteOrder(QAudioFormat::LittleEndian);
 
-    m_input = std::make_unique<QAudioInput>(m_device, format);
-    m_input->start(m_helper.get());
-    m_input->setBufferSize(m_samplerate/m_framerate*sizeof(qint16)*2);
+    m_private = std::make_unique<AudioDevicePrivate>(*this, m_device, format);
+    m_private->input.start(&m_private->helper);
+    //m_private->input.setBufferSize(m_samplerate/m_framerate*sizeof(qint16)*2);
 }
 
 void AudioDevice::stop()
 {
-    m_input = nullptr;
+    qDebug() << "called";
+    m_private = nullptr;
 }
 
 
@@ -54,9 +74,15 @@ AudioDeviceHelper::AudioDeviceHelper(AudioDevice &audioDevice) :
     QIODevice(&audioDevice),
     m_audioDevice(audioDevice)
 {
+    qDebug() << "called";
     setOpenMode(QIODevice::WriteOnly);
 }
 
+AudioDeviceHelper::~AudioDeviceHelper()
+{
+    qDebug() << "called";
+}
+
 qint64 AudioDeviceHelper::readData(char *data, qint64 maxlen)
 {
     Q_UNUSED(data)