Implemented very basic tone generator

audiodevice.cpp

@@ -3,15 +3,13 @@
 // Qt includes
 #include <QIODevice>
 #include <QAudioInput>
-#include <QDebug>
 
 namespace {
 //! private helper to allow QAudioInput to write to a io device
 class AudioDeviceHelper : public QIODevice
 {
 public:
-    explicit AudioDeviceHelper(AudioDevice &audioDevice);
-    ~AudioDeviceHelper();
+    explicit AudioDeviceHelper(AudioDevice &audioDevice, QObject *parent = nullptr);
 
     qint64 readData(char *data, qint64 maxlen) override;
     qint64 writeData(const char *data, qint64 len) override;
@@ -20,17 +18,9 @@ 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";
-    }
+class AudioDevicePrivate {
+public:
+    AudioDevicePrivate(AudioDevice &audioDevice, const QAudioDeviceInfo &audioDeviceInfo, const QAudioFormat &format);
 
     AudioDeviceHelper helper;
     QAudioInput input;
@@ -46,12 +36,12 @@ AudioDevice::~AudioDevice() = default;
 
 void AudioDevice::start()
 {
-    qDebug() << m_device.deviceName();
+    Q_ASSERT(!running());
 
     QAudioFormat format;
     format.setSampleRate(m_samplerate);
     format.setChannelCount(2);
-    format.setSampleSize(16);
+    format.setSampleSize(sizeof(SamplePair::Type) * 8);
     format.setSampleType(QAudioFormat::SignedInt);
     format.setCodec("audio/pcm");
     format.setByteOrder(QAudioFormat::LittleEndian);
@@ -63,26 +53,20 @@ void AudioDevice::start()
 
 void AudioDevice::stop()
 {
-    qDebug() << "called";
+    Q_ASSERT(running());
+
     m_private = nullptr;
 }
 
 
 
 namespace {
-AudioDeviceHelper::AudioDeviceHelper(AudioDevice &audioDevice) :
-    QIODevice(&audioDevice),
-    m_audioDevice(audioDevice)
+AudioDeviceHelper::AudioDeviceHelper(AudioDevice &audioDevice, QObject *parent) :
+    QIODevice{parent}, m_audioDevice(audioDevice)
 {
-    qDebug() << "called";
     setOpenMode(QIODevice::WriteOnly);
 }
 
-AudioDeviceHelper::~AudioDeviceHelper()
-{
-    qDebug() << "called";
-}
-
 qint64 AudioDeviceHelper::readData(char *data, qint64 maxlen)
 {
     Q_UNUSED(data)
@@ -93,8 +77,15 @@ qint64 AudioDeviceHelper::readData(char *data, qint64 maxlen)
 qint64 AudioDeviceHelper::writeData(const char *data, qint64 len)
 {
     Q_ASSERT(len % sizeof(SamplePair) == 0);
-    emit m_audioDevice.samplesReceived(reinterpret_cast<const SamplePair*>(data),
-                                       reinterpret_cast<const SamplePair*>(data + (len/sizeof(SamplePair))));
+
+    m_audioDevice.emitSamples(reinterpret_cast<const SamplePair*>(data),
+                              reinterpret_cast<const SamplePair*>(data) + (len/sizeof(SamplePair)));
+
     return len;
 }
+
+AudioDevicePrivate::AudioDevicePrivate(AudioDevice &audioDevice, const QAudioDeviceInfo &audioDeviceInfo, const QAudioFormat &format) :
+    helper{audioDevice}, input{audioDeviceInfo, format}
+{
+}
 }