diff options
Diffstat (limited to 'src/ConfigParser.h')
| -rw-r--r-- | src/ConfigParser.h | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/src/ConfigParser.h b/src/ConfigParser.h index 0be3558..0463470 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 @@ -61,7 +58,6 @@ struct mod_settings_t { float gainmodeVariance = 4.0f; // To handle the timestamp offset of the modulator - unsigned tist_delay_stages = 1; // because GainControl is pipelined double tist_offset_s = 0.0; bool loop = false; @@ -85,12 +81,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 }; |