diff options
| author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2017-11-03 10:40:09 +0100 |
|---|---|---|
| committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2017-11-03 10:40:09 +0100 |
| commit | 53c3963b8a47d485e6776caa06e86d14a8520c0c (patch) | |
| tree | a634cda90d463f86959b91809d959d6558a66054 /src/ConfigParser.h | |
| parent | 450c1e1d29a08326f4a370005bacafd528cd25e7 (diff) | |
| download | dabmod-53c3963b8a47d485e6776caa06e86d14a8520c0c.tar.gz dabmod-53c3963b8a47d485e6776caa06e86d14a8520c0c.tar.bz2 dabmod-53c3963b8a47d485e6776caa06e86d14a8520c0c.zip | |
Port UHD to new SDR abstraction
Diffstat (limited to 'src/ConfigParser.h')
| -rw-r--r-- | src/ConfigParser.h | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/src/ConfigParser.h b/src/ConfigParser.h index 4d936b8..dd6c040 100644 --- a/src/ConfigParser.h +++ b/src/ConfigParser.h @@ -35,12 +35,8 @@ #include "GainControl.h" #include "TII.h" #include "output/SDR.h" -#if defined(HAVE_OUTPUT_UHD) -# include "OutputUHD.h" -#endif -#if defined(HAVE_SOAPYSDR) -# include "output/Soapy.h" -#endif +#include "output/UHD.h" +#include "output/Soapy.h" #define ZMQ_INPUT_MAX_FRAME_QUEUE 500 @@ -83,12 +79,7 @@ struct mod_settings_t { float cfrClip = 1.0f; float cfrErrorClip = 1.0f; - -#if defined(HAVE_OUTPUT_UHD) - OutputUHDConfig outputuhd_conf; -#endif - -#if defined(HAVE_SOAPYSDR) +#if defined(HAVE_OUTPUT_UHD) || defined(HAVE_SOAPYSDR) Output::SDRDeviceConfig sdr_device_config; #endif |