diff options
author | Dimitri Stolnikov <horiz0n@gmx.net> | 2013-01-10 20:33:45 +0100 |
---|---|---|
committer | Dimitri Stolnikov <horiz0n@gmx.net> | 2013-01-10 20:33:45 +0100 |
commit | d243abe2d7d82f8840c35c005fd8ee86535b6b0e (patch) | |
tree | c747934f236606e57a739486fd7edd3c51b80ddb | |
parent | f81bf7cf12c810c5c4c6d783c60e1476977b0819 (diff) |
return default devices for file and rtl_tcp in device::find()
-rw-r--r-- | lib/osmosdr_device.cc | 18 | ||||
-rw-r--r-- | lib/osmosdr_source_c_impl.cc | 4 |
2 files changed, 22 insertions, 0 deletions
diff --git a/lib/osmosdr_device.cc b/lib/osmosdr_device.cc index aaef32a..3043645 100644 --- a/lib/osmosdr_device.cc +++ b/lib/osmosdr_device.cc @@ -32,7 +32,9 @@ /* #define ENABLE_OSMOSDR #define ENABLE_FCD +#define ENABLE_FILE #define ENABLE_RTL +#define ENABLE_RTL_TCP #define ENABLE_UHD #define ENABLE_MIRI */ @@ -44,10 +46,18 @@ #include <fcd_source.h> #endif +#ifdef ENABLE_FILE +#include <file_source_c.h> +#endif + #ifdef ENABLE_RTL #include <rtl_source_c.h> #endif +#ifdef ENABLE_RTL_TCP +#include <rtl_tcp_source_c.h> +#endif + #ifdef ENABLE_UHD #include <uhd_source_c.h> #endif @@ -115,10 +125,18 @@ devices_t device::find(const device_t &hint) BOOST_FOREACH( std::string dev, fcd_source::get_devices() ) devices.push_back( device_t(dev) ); #endif +#ifdef ENABLE_FILE + BOOST_FOREACH( std::string dev, file_source_c::get_devices() ) + devices.push_back( device_t(dev) ); +#endif #ifdef ENABLE_RTL BOOST_FOREACH( std::string dev, rtl_source_c::get_devices() ) devices.push_back( device_t(dev) ); #endif +#ifdef ENABLE_RTL_TCP + BOOST_FOREACH( std::string dev, rtl_tcp_source_c::get_devices() ) + devices.push_back( device_t(dev) ); +#endif #ifdef ENABLE_UHD BOOST_FOREACH( std::string dev, uhd_source_c::get_devices() ) devices.push_back( device_t(dev) ); diff --git a/lib/osmosdr_source_c_impl.cc b/lib/osmosdr_source_c_impl.cc index 208513c..ed78423 100644 --- a/lib/osmosdr_source_c_impl.cc +++ b/lib/osmosdr_source_c_impl.cc @@ -91,7 +91,9 @@ osmosdr_source_c_impl::osmosdr_source_c_impl (const std::string &args) std::vector< std::string > dev_types; +#ifdef ENABLE_FILE dev_types.push_back("file"); +#endif #ifdef ENABLE_OSMOSDR dev_types.push_back("osmosdr"); #endif @@ -101,7 +103,9 @@ osmosdr_source_c_impl::osmosdr_source_c_impl (const std::string &args) #ifdef ENABLE_RTL dev_types.push_back("rtl"); #endif +#ifdef ENABLE_RTL_TCP dev_types.push_back("rtl_tcp"); +#endif #ifdef ENABLE_UHD dev_types.push_back("uhd"); #endif |