1 files changed, 5 insertions, 12 deletions
diff --git a/src/ConfigParser.h b/src/ConfigParser.h
index 0be3558..3f64883 100644
--- a/src/ConfigParser.h
+++ b/src/ConfigParser.h
@@ -34,12 +34,9 @@
 #include <string>
 #include "GainControl.h"
 #include "TII.h"
-#if defined(HAVE_OUTPUT_UHD)
-#   include "OutputUHD.h"
-#endif
-#if defined(HAVE_SOAPYSDR)
-#   include "OutputSoapy.h"
-#endif
+#include "output/SDR.h"
+#include "output/UHD.h"
+#include "output/Soapy.h"
 
 #define ZMQ_INPUT_MAX_FRAME_QUEUE 500
 
@@ -85,12 +82,8 @@ struct mod_settings_t {
     // Settings for the OFDM windowing
     unsigned ofdmWindowOverlap = 0;
 
-#if defined(HAVE_OUTPUT_UHD)
-    OutputUHDConfig outputuhd_conf;
-#endif
-
-#if defined(HAVE_SOAPYSDR)
-    OutputSoapyConfig outputsoapy_conf;
+#if defined(HAVE_OUTPUT_UHD) || defined(HAVE_SOAPYSDR)
+    Output::SDRDeviceConfig sdr_device_config;
 #endif
 
 };