added zmq_audiosender class and removed the code that was doing the s…

…ame thing in mainwindow (untested). tidy
jontio · Jul 26, 2021 · 7b87374 · 7b87374
1 parent eb76851
commit 7b87374
Show file tree

Hide file tree

Showing 16 changed files with 257 additions and 262 deletions.
diff --git a/JAERO/JAERO.pro b/JAERO/JAERO.pro
@@ -85,8 +85,9 @@ SOURCES += mainwindow.cpp \
     $$JFFT_PATH/jfft.cpp \
     util/stdio_utils.cpp \
     util/file_utils.cpp \
-    util/RuntimeError.cpp\
-    audioreceiver.cpp
+    util/RuntimeError.cpp \
+    zmq_audiosender.cpp \
+    zmq_audioreceiver.cpp
 
 
 HEADERS  += mainwindow.h \
@@ -121,8 +122,9 @@ HEADERS  += mainwindow.h \
     $$JFFT_PATH/jfft.h \
     util/stdio_utils.h \
     util/file_utils.h \
-    util/RuntimeError.h\
-    audioreceiver.h
+    util/RuntimeError.h \
+    zmq_audioreceiver.h \
+    zmq_audiosender.h
 
 
 # Tell the qcustomplot header that it will be used as library:

diff --git a/JAERO/audioburstmskdemodulator.cpp b/JAERO/audioburstmskdemodulator.cpp
@@ -3,27 +3,26 @@
 #include <QDebug>
 
 AudioBurstMskDemodulator::AudioBurstMskDemodulator(QObject *parent)
-:   BurstMskDemodulator(parent),
-  m_audioInput(NULL)
+    :   BurstMskDemodulator(parent),
+      m_audioInput(NULL)
 {
-//
+    //
 }
 
 void AudioBurstMskDemodulator::start()
 {
     BurstMskDemodulator::start();
     if(!settings.zmqAudio)
     {
-    if(m_audioInput)m_audioInput->start(this);
-}
+        if(m_audioInput)m_audioInput->start(this);
+    }
 }
 
 void AudioBurstMskDemodulator::stop()
 {
     if(!settings.zmqAudio)
     {
-    if(m_audioInput)m_audioInput->stop();
-
+        if(m_audioInput)m_audioInput->stop();
     }
     BurstMskDemodulator::stop();
 }

diff --git a/JAERO/audioburstoqpskdemodulator.cpp b/JAERO/audioburstoqpskdemodulator.cpp
@@ -2,8 +2,8 @@
 #include <QDebug>
 
 AudioBurstOqpskDemodulator::AudioBurstOqpskDemodulator(QObject *parent)
-:   BurstOqpskDemodulator(parent),
-  m_audioInput(NULL)
+    :   BurstOqpskDemodulator(parent),
+      m_audioInput(NULL)
 {
     demod2=new BurstOqpskDemodulator(this);
     demod2->channel_select_other=true;
@@ -17,17 +17,16 @@ void AudioBurstOqpskDemodulator::start()
     demod2->start();
     if(!settings.zmqAudio)
     {
-    if(m_audioInput)m_audioInput->start(this);
-}
+        if(m_audioInput)m_audioInput->start(this);
+    }
 }
 
 void AudioBurstOqpskDemodulator::stop()
 {
     if(m_audioInput)m_audioInput->stop();
     if(!settings.zmqAudio)
     {
-
-    BurstOqpskDemodulator::stop();
+        BurstOqpskDemodulator::stop();
     }
     demod2->stop();
 }
@@ -47,7 +46,7 @@ void AudioBurstOqpskDemodulator::setSettings(Settings _settings)
         //set the format
         m_format.setSampleRate(settings.Fs);
         if(settings.channel_stereo)m_format.setChannelCount(2);
-         else m_format.setChannelCount(1);
+        else m_format.setChannelCount(1);
         m_format.setSampleSize(16);
         m_format.setCodec("audio/pcm");
         m_format.setByteOrder(QAudioFormat::LittleEndian);

diff --git a/JAERO/audiomskdemodulator.cpp b/JAERO/audiomskdemodulator.cpp
@@ -3,27 +3,26 @@
 #include <QDebug>
 
 AudioMskDemodulator::AudioMskDemodulator(QObject *parent)
-:   MskDemodulator(parent),
-  m_audioInput(NULL)
+    :   MskDemodulator(parent),
+      m_audioInput(NULL)
 {
-//
+    //
 }
 
 void AudioMskDemodulator::start()
 {
     MskDemodulator::start();
     if(!settings.zmqAudio)
     {
-    if(m_audioInput)m_audioInput->start(this);
-}
+        if(m_audioInput)m_audioInput->start(this);
+    }
 }
 
 void AudioMskDemodulator::stop()
 {
     if(!settings.zmqAudio)
     {
-    if(m_audioInput)m_audioInput->stop();
-
+        if(m_audioInput)m_audioInput->stop();
     }
     MskDemodulator::stop();
 }

diff --git a/JAERO/audiooqpskdemodulator.cpp b/JAERO/audiooqpskdemodulator.cpp
@@ -3,10 +3,10 @@
 #include <QDebug>
 
 AudioOqpskDemodulator::AudioOqpskDemodulator(QObject *parent)
-:   OqpskDemodulator(parent),
-  m_audioInput(NULL)
+    :   OqpskDemodulator(parent),
+      m_audioInput(NULL)
 {
-//
+    //
 }
 
 void AudioOqpskDemodulator::start()
@@ -15,17 +15,16 @@ void AudioOqpskDemodulator::start()
 
     if(!settings.zmqAudio)
     {
-    if(m_audioInput)m_audioInput->start(this);
-}
+        if(m_audioInput)m_audioInput->start(this);
+    }
 
 }
 
 void AudioOqpskDemodulator::stop()
 {
     if(!settings.zmqAudio)
     {
-    if(m_audioInput)m_audioInput->stop();
-
+        if(m_audioInput)m_audioInput->stop();
     }
     OqpskDemodulator::stop();
 }