Added loop toggle in Audio menu

Author: BenPyton

LoopableBuffer.cpp

@@ -0,0 +1,35 @@
+#include "LoopableBuffer.h"
+
+LoopableBuffer::LoopableBuffer(QObject* _parent)
+    : QBuffer(_parent), m_loop(false)
+{
+}
+
+LoopableBuffer::LoopableBuffer(QByteArray *_byteArray, QObject* _parent)
+    : QBuffer(_byteArray, _parent), m_loop(false)
+{
+}
+
+qint64 LoopableBuffer::readData(char *_data, qint64 _len)
+{
+    if(_len <= 0)
+        return qint64(0);
+
+    if(m_loop)
+    {
+        qint64 dataPos = 0;
+        qint64 tmpLen = 0;
+        while(dataPos < _len)
+        {
+            tmpLen = qMin(_len - dataPos, size() - pos());
+            dataPos += QBuffer::readData(_data + dataPos, tmpLen);
+            if(atEnd())
+                reset();
+        }
+        return dataPos;
+    }
+    else
+    {
+        return QBuffer::readData(_data, _len);
+    }
+}

LoopableBuffer.h

@@ -0,0 +1,22 @@
+#ifndef LOOPABLEBUFFER_H
+#define LOOPABLEBUFFER_H
+
+#include <QBuffer>
+
+class LoopableBuffer : public QBuffer
+{
+public:
+    LoopableBuffer(QObject* _parent = nullptr);
+    LoopableBuffer(QByteArray *_byteArray, QObject* _parent = nullptr);
+
+    inline void setLoop(bool _loop) { m_loop = _loop; }
+    inline bool loop() { return m_loop; }
+
+protected:
+    virtual qint64 readData(char* _data, qint64 _len) override;
+
+private:
+    bool m_loop;
+};
+
+#endif // LOOPABLEBUFFER_H

Signal.cpp

@@ -25,6 +25,7 @@
 #include "Components.h"
 #include <QAudioRecorder>
 #include "WAVFormat.h"
+#include "LoopableBuffer.h"
 
 Signal::Signal(QObject *parent)
     : QObject(parent),
@@ -78,12 +79,14 @@ Signal::Signal(QObject *parent)
     connect(m_audio, SIGNAL(stateChanged(QAudio::State)), this, SLOT(handleStateChanged(QAudio::State)));
     m_audio->setVolume(0.2);
 
-    // start audio with buffer
-    m_buffer = new QBuffer(m_samples);
+    // create the buffer with the audio samples
+    m_buffer = new LoopableBuffer(m_samples);
+    m_buffer->open(QIODevice::ReadOnly);
 }
 
 Signal::~Signal()
 {
+    stop();
     m_buffer->close();
     delete m_audio;
     delete m_buffer;
@@ -123,26 +126,14 @@ qint32 Signal::getSample(int index)
 {
     if(m_samples != nullptr && index * 4 >= 0 && index * 4 <= m_samples->size() - 4)
     {
-        //qint32 convertedValue =
         return qFromLittleEndian<qint32>(m_samples->constData() + (index * 4));
-        //m_samples->append(convertedValue, 4);
     }
     return 0;
 }
 
 void Signal::generate()
 {
-//    if(m_samples != nullptr)
-//    {
-//        delete m_samples;
-//    }
-
-
-
-
     int totalSample = qRound(m_duration * m_sampleRate);
-    //m_samples = new QByteArray(totalSample, NULL);
-    //output.init();
 
     m_samples->clear();
 
@@ -154,17 +145,14 @@ void Signal::generate()
     for (int i = 0; i < totalSample; i++)
     {
         qreal x = qreal(i) / m_sampleRate;
-        //qDebug() << "time: " << x;
-        //qreal sample = Utils::Clamp(sin(400.0 * x), -1.0, 1.0);
-        //qreal sample = qSin(400.0 * x * 2 * M_PI);
         qreal sample = m_component != nullptr ? Utils::Clamp(m_component->getOutput(x), -1., 1.) : 0.0;
 
         //qDebug() << "time: " << x << " | value: " << sample;
         qint32 value = qint32(qRound(INT32_MAX * sample));
 
         char convertedValue[4] = {0};
         qToLittleEndian(value, convertedValue);
-        m_samples->append(convertedValue, 4);//QByteArray::number(convertedValue));
+        m_samples->append(convertedValue, 4);
     }
 
     qDebug() << "Generated!";
@@ -178,21 +166,49 @@ void Signal::exportWAV(QString fileName)
     wav.writeToFile(fileName, m_samples);
 }
 
+void Signal::loop(bool enable)
+{
+    m_buffer->setLoop(enable);
+}
+
 void Signal::play()
 {
-    if(m_buffer->isOpen())
+    if(m_audio->state() == QAudio::SuspendedState)
     {
-        m_audio->stop();
-        m_buffer->close();
+        m_audio->resume();
     }
+    else
+    {
+        stop();
+        toStart();
+        m_audio->start(m_buffer);
+    }
+}
 
-    m_buffer->open(QIODevice::ReadOnly);
-    m_audio->start(m_buffer);
+void Signal::stop()
+{
+    if(m_audio->state() == QAudio::ActiveState)
+    {
+        m_audio->stop();
+    }
 }
 
 void Signal::pause()
 {
+    if(m_audio->state() == QAudio::ActiveState)
+    {
+        m_audio->suspend();
+    }
+}
+
+void Signal::toStart()
+{
+    m_buffer->reset();
+}
 
+void Signal::toEnd()
+{
+    m_buffer->seek(qMax(qint64(0), m_buffer->size() - 1));
 }
 
 

Signal.h

@@ -27,6 +27,7 @@
 #include <QAudioOutput>
 
 class Component;
+class LoopableBuffer;
 
 class Signal : public QObject
 {
@@ -52,9 +53,13 @@ class Signal : public QObject
 
 public slots:
     void play();
+    void stop();
     void pause();
+    void toStart();
+    void toEnd();
     void generate();
     void exportWAV(QString fileName);
+    void loop(bool enable);
 
 private slots:
     void handleStateChanged(QAudio::State newState);
@@ -64,7 +69,7 @@ private slots:
     qreal m_duration;
     QAudioOutput* m_audio;
     QByteArray* m_samples;
-    QBuffer* m_buffer;
+    LoopableBuffer* m_buffer;
     Component* m_component;
 };
 

SoundGenerator.pro

@@ -64,7 +64,8 @@ SOURCES += \
     UI/PinOutputItem.cpp \
     UI/PushOrDragButton.cpp \
     UI/WaveFormChunk.cpp \
-    UI/WaveFormView.cpp
+    UI/WaveFormView.cpp \
+    LoopableBuffer.cpp
 
 HEADERS += \
     Components/AddComponent.h \
@@ -104,7 +105,8 @@ HEADERS += \
     UI/PinOutputItem.h \
     UI/PushOrDragButton.h \
     UI/WaveFormChunk.h \
-    UI/WaveFormView.h
+    UI/WaveFormView.h \
+    LoopableBuffer.h
 
 FORMS += \
     UI/mainwindow.ui

UI/MainWindow.cpp

@@ -129,6 +129,7 @@ MainWindow::MainWindow(QWidget *parent) :
 
     QAction* act_loop = new QAction("Loop", this);
     act_loop->setCheckable(true);
+    connect(act_loop, SIGNAL(triggered(bool)), &m_signal, SLOT(loop(bool)));
 
     // ===== File Edit =====
 
@@ -193,7 +194,7 @@ MainWindow::MainWindow(QWidget *parent) :
 
     ui->menuAudio->addAction(act_generate);
     ui->menuAudio->addAction(act_play);
-    //ui->menuAudio->addAction(act_loop);
+    ui->menuAudio->addAction(act_loop);
 
     ui->mainToolBar->clear();
     ui->mainToolBar->addAction(act_newFile);
@@ -251,20 +252,10 @@ MainWindow::MainWindow(QWidget *parent) :
     m_dirtyable = true;
 }
 
-QMenu* MainWindow::getMenu(QString name)
+MainWindow::~MainWindow()
 {
-    QMenu* menu = nullptr;
-
-    QList<QMenu*> menus = ui->menuBar->findChildren<QMenu*>();
-    for(int i = 0; i < menus.size() && menu == nullptr; i++)
-    {
-        if(menus[i]->title() == name)
-        {
-            menu = menus[i];
-        }
-    }
-
-    return menu;
+    delete m_scene;
+    delete ui;
 }
 
 void MainWindow::setFileName(QString fileName)
@@ -335,12 +326,6 @@ void MainWindow::mousePressEvent(QMouseEvent *event)
     QMainWindow::mousePressEvent(event);
 }
 
-MainWindow::~MainWindow()
-{
-    delete m_scene;
-    delete ui;
-}
-
 void MainWindow::newFile()
 {
     QMessageBox::StandardButton reply = askSaveChanges("creating a new project");

UI/MainWindow.h

@@ -41,12 +41,9 @@ class MainWindow : public QMainWindow
     explicit MainWindow(QWidget *parent = nullptr);
     virtual ~MainWindow() override;
 
-    QMenu* getMenu(QString name);
     QString fileName() { return m_fileName; }
     void setFileName(QString fileName);
-
     void readSettings();
-    
 
 protected:
     virtual void closeEvent(QCloseEvent* event) override;