improve physical structure

Audio/AudioDevice.cpp

@@ -1,10 +1,10 @@
-#include "AudioDevice.hpp"
+#include "AudioDevice.hpp"
-
+
-bool AudioDevice::initialize (OpenMode mode, Channel channel)
+bool AudioDevice::initialize (OpenMode mode, Channel channel)
-{
+{
-  m_channel = channel;
+  m_channel = channel;
-
+
-  // open and ensure we are unbuffered if possible
+  // open and ensure we are unbuffered if possible
-  return QIODevice::open (mode | QIODevice::Unbuffered);
+  return QIODevice::open (mode | QIODevice::Unbuffered);
-}
+}
-
+

Audio/soundin.h

@@ -9,7 +9,7 @@
 #include <QPointer>
 #include <QAudioInput>
 
-#include "AudioDevice.hpp"
+#include "Audio/AudioDevice.hpp"
 
 class QAudioDeviceInfo;
 class QAudioInput;

CMakeLists.txt

@@ -243,7 +243,7 @@ set (wsjt_qt_CXXSRCS
   validators/LiveFrequencyValidator.cpp
   GetUserId.cpp
   TraceFile.cpp
-  AudioDevice.cpp
+  Audio/AudioDevice.cpp
   Transceiver/Transceiver.cpp
   Transceiver/TransceiverBase.cpp
   Transceiver/EmulateSplitTransceiver.cpp
@@ -271,7 +271,7 @@ set (wsjt_qt_CXXSRCS
   Transceiver/EqualizationToolsDialog.cpp
   widgets/DoubleClickablePushButton.cpp
   widgets/DoubleClickableRadioButton.cpp
-  LotWUsers.cpp
+  Network/LotWUsers.cpp
   models/DecodeHighlightingModel.cpp
   widgets/DecodeHighlightingListView.cpp
   models/FoxLog.cpp
@@ -304,14 +304,14 @@ set (jt9_CXXSRCS
 set (wsjtx_CXXSRCS
   logbook/logbook.cpp
   Network/psk_reporter.cpp
-  Modulator.cpp
+  Modulator/Modulator.cpp
   Detector/Detector.cpp
   widgets/logqso.cpp
   widgets/displaytext.cpp
-  decodedtext.cpp
+  Decoder/decodedtext.cpp
   getfile.cpp
-  soundout.cpp
+  Audio/soundout.cpp
-  soundin.cpp
+  Audio/soundin.cpp
   widgets/meterwidget.cpp
   widgets/signalmeter.cpp
   widgets/plotter.cpp
@@ -324,12 +324,12 @@ set (wsjtx_CXXSRCS
   widgets/astro.cpp
   widgets/messageaveraging.cpp
   widgets/colorhighlighting.cpp
-  WsprTxScheduler.cpp
+  WSPR/WsprTxScheduler.cpp
   widgets/mainwindow.cpp
   Configuration.cpp
   main.cpp
-  wsprnet.cpp
+  Network/wsprnet.cpp
-  WSPRBandHopping.cpp
+  WSPR/WSPRBandHopping.cpp
   widgets/ExportCabrillo.cpp
   )
 

Configuration.cpp

@@ -183,7 +183,7 @@
 #include "widgets/MessageBox.hpp"
 #include "validators/MaidenheadLocatorValidator.hpp"
 #include "validators/CallsignValidator.hpp"
-#include "LotWUsers.hpp"
+#include "Network/LotWUsers.hpp"
 #include "models/DecodeHighlightingModel.hpp"
 #include "logbook/logbook.h"
 

Configuration.hpp

@@ -6,7 +6,7 @@
 
 #include "Radio.hpp"
 #include "models/IARURegions.hpp"
-#include "AudioDevice.hpp"
+#include "Audio/AudioDevice.hpp"
 #include "Transceiver/Transceiver.hpp"
 
 #include "pimpl_h.hpp"

Detector/Detector.hpp

@@ -1,6 +1,6 @@
 #ifndef DETECTOR_HPP__
 #define DETECTOR_HPP__
-#include "AudioDevice.hpp"
+#include "Audio/AudioDevice.hpp"
 #include <QScopedArrayPointer>
 
 //

MetaDataRegistry.cpp

@@ -6,7 +6,7 @@
 
 #include "Radio.hpp"
 #include "models/FrequencyList.hpp"
-#include "AudioDevice.hpp"
+#include "Audio/AudioDevice.hpp"
 #include "Configuration.hpp"
 #include "models/StationList.hpp"
 #include "Transceiver/Transceiver.hpp"

Modulator/Modulator.cpp

@@ -4,7 +4,7 @@
 #include <QDateTime>
 #include <QDebug>
 #include "widgets/mainwindow.h" // TODO: G4WJS - break this dependency
-#include "soundout.h"
+#include "Audio/soundout.h"
 #include "commons.h"
 
 #include "moc_Modulator.cpp"

Modulator/Modulator.hpp

@@ -4,7 +4,7 @@
 #include <QAudio>
 #include <QPointer>
 
-#include "AudioDevice.hpp"
+#include "Audio/AudioDevice.hpp"
 
 class SoundOutput;
 

doc/design/DecoderRefactor.puml

@@ -8,6 +8,9 @@ interface IDecoder
 interface IEncoder
 interface IDecode
 
+IDecoder <-- IProtocol
+IEncoder <-- IProtocol
+
 class FT8
 IProtocol <|-- FT8
 

widgets/displaytext.cpp

@@ -16,7 +16,7 @@
 #include <QDebug>
 
 #include "Configuration.hpp"
-#include "LotWUsers.hpp"
+#include "Network/LotWUsers.hpp"
 #include "models/DecodeHighlightingModel.hpp"
 #include "logbook/logbook.h"
 

widgets/displaytext.h

@@ -8,7 +8,7 @@
 #include <QPair>
 #include <QString>
 
-#include "decodedtext.h"
+#include "Decoder/decodedtext.h"
 
 class QAction;
 class Configuration;

widgets/mainwindow.cpp

@@ -43,9 +43,9 @@
 #include "revision_utils.hpp"
 #include "qt_helpers.hpp"
 #include "Network/NetworkAccessManager.hpp"
-#include "soundout.h"
+#include "Audio/soundout.h"
-#include "soundin.h"
+#include "Audio/soundin.h"
-#include "Modulator.hpp"
+#include "Modulator/Modulator.hpp"
 #include "Detector/Detector.hpp"
 #include "plotter.h"
 #include "echoplot.h"
@@ -58,14 +58,14 @@
 #include "widegraph.h"
 #include "sleep.h"
 #include "logqso.h"
-#include "decodedtext.h"
+#include "Decoder/decodedtext.h"
 #include "Radio.hpp"
 #include "models/Bands.hpp"
 #include "Transceiver/TransceiverFactory.hpp"
 #include "models/StationList.hpp"
 #include "validators/LiveFrequencyValidator.hpp"
 #include "Network/MessageClient.hpp"
-#include "wsprnet.h"
+#include "Network/wsprnet.h"
 #include "signalmeter.h"
 #include "HelpTextWindow.hpp"
 #include "SampleDownloader.hpp"
@@ -74,7 +74,7 @@
 #include "validators/MaidenheadLocatorValidator.hpp"
 #include "validators/CallsignValidator.hpp"
 #include "Transceiver/EqualizationToolsDialog.hpp"
-#include "LotWUsers.hpp"
+#include "Network/LotWUsers.hpp"
 #include "logbook/AD1CCty.hpp"
 #include "models/FoxLog.hpp"
 #include "models/CabrilloLog.hpp"

widgets/mainwindow.h

@@ -22,13 +22,13 @@
 #include <QFuture>
 #include <QFutureWatcher>
 
-#include "AudioDevice.hpp"
+#include "Audio/AudioDevice.hpp"
 #include "commons.h"
 #include "Radio.hpp"
 #include "models/Modes.hpp"
 #include "models/FrequencyList.hpp"
 #include "Configuration.hpp"
-#include "WSPRBandHopping.hpp"
+#include "WSPR/WSPRBandHopping.hpp"
 #include "Transceiver/Transceiver.hpp"
 #include "DisplayManual.hpp"
 #include "Network/psk_reporter.h"