return default devices for file and rtl_tcp in device::find()

gr3.6
Dimitri Stolnikov 10 years ago
parent f81bf7cf12
commit d243abe2d7
  1. 18
      lib/osmosdr_device.cc
  2. 4
      lib/osmosdr_source_c_impl.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) );

@ -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

Loading…
Cancel
Save