forked from sdr/gr-osmosdr
source/sink: don't discover devices if already specified via args
This commit is contained in:
parent
4bb2fa4e2f
commit
7a8224bcb8
|
@ -104,25 +104,25 @@ sink_impl::sink_impl( const std::string &args )
|
||||||
#ifdef WORKAROUND_GR_HIER_BLOCK2_BUG
|
#ifdef WORKAROUND_GR_HIER_BLOCK2_BUG
|
||||||
try {
|
try {
|
||||||
#endif
|
#endif
|
||||||
std::vector< std::string > dev_list;
|
if ( ! device_specified ) {
|
||||||
|
std::vector< std::string > dev_list;
|
||||||
#ifdef ENABLE_UHD
|
#ifdef ENABLE_UHD
|
||||||
BOOST_FOREACH( std::string dev, uhd_sink_c::get_devices() )
|
BOOST_FOREACH( std::string dev, uhd_sink_c::get_devices() )
|
||||||
dev_list.push_back( dev );
|
dev_list.push_back( dev );
|
||||||
#endif
|
#endif
|
||||||
#ifdef ENABLE_BLADERF
|
#ifdef ENABLE_BLADERF
|
||||||
BOOST_FOREACH( std::string dev, bladerf_sink_c::get_devices() )
|
BOOST_FOREACH( std::string dev, bladerf_sink_c::get_devices() )
|
||||||
dev_list.push_back( dev );
|
dev_list.push_back( dev );
|
||||||
#endif
|
#endif
|
||||||
#ifdef ENABLE_HACKRF
|
#ifdef ENABLE_HACKRF
|
||||||
BOOST_FOREACH( std::string dev, hackrf_sink_c::get_devices() )
|
BOOST_FOREACH( std::string dev, hackrf_sink_c::get_devices() )
|
||||||
dev_list.push_back( dev );
|
dev_list.push_back( dev );
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// std::cerr << std::endl;
|
// std::cerr << std::endl;
|
||||||
// BOOST_FOREACH( std::string dev, dev_list )
|
// BOOST_FOREACH( std::string dev, dev_list )
|
||||||
// std::cerr << "'" << dev << "'" << std::endl;
|
// std::cerr << "'" << dev << "'" << std::endl;
|
||||||
|
|
||||||
if (!device_specified) {
|
|
||||||
if ( dev_list.size() )
|
if ( dev_list.size() )
|
||||||
arg_list.push_back( dev_list.front() );
|
arg_list.push_back( dev_list.front() );
|
||||||
else
|
else
|
||||||
|
|
|
@ -168,49 +168,49 @@ source_impl::source_impl( const std::string &args )
|
||||||
#ifdef WORKAROUND_GR_HIER_BLOCK2_BUG
|
#ifdef WORKAROUND_GR_HIER_BLOCK2_BUG
|
||||||
try {
|
try {
|
||||||
#endif
|
#endif
|
||||||
std::vector< std::string > dev_list;
|
if ( ! device_specified ) {
|
||||||
|
std::vector< std::string > dev_list;
|
||||||
#ifdef ENABLE_OSMOSDR
|
#ifdef ENABLE_OSMOSDR
|
||||||
BOOST_FOREACH( std::string dev, osmosdr_src_c::get_devices() )
|
BOOST_FOREACH( std::string dev, osmosdr_src_c::get_devices() )
|
||||||
dev_list.push_back( dev );
|
dev_list.push_back( dev );
|
||||||
#endif
|
#endif
|
||||||
#ifdef ENABLE_FCD
|
#ifdef ENABLE_FCD
|
||||||
BOOST_FOREACH( std::string dev, fcd_source_c::get_devices() )
|
BOOST_FOREACH( std::string dev, fcd_source_c::get_devices() )
|
||||||
dev_list.push_back( dev );
|
dev_list.push_back( dev );
|
||||||
#endif
|
#endif
|
||||||
#ifdef ENABLE_RTL
|
#ifdef ENABLE_RTL
|
||||||
BOOST_FOREACH( std::string dev, rtl_source_c::get_devices() )
|
BOOST_FOREACH( std::string dev, rtl_source_c::get_devices() )
|
||||||
dev_list.push_back( dev );
|
dev_list.push_back( dev );
|
||||||
#endif
|
#endif
|
||||||
#ifdef ENABLE_UHD
|
#ifdef ENABLE_UHD
|
||||||
BOOST_FOREACH( std::string dev, uhd_source_c::get_devices() )
|
BOOST_FOREACH( std::string dev, uhd_source_c::get_devices() )
|
||||||
dev_list.push_back( dev );
|
dev_list.push_back( dev );
|
||||||
#endif
|
#endif
|
||||||
#ifdef ENABLE_MIRI
|
#ifdef ENABLE_MIRI
|
||||||
BOOST_FOREACH( std::string dev, miri_source_c::get_devices() )
|
BOOST_FOREACH( std::string dev, miri_source_c::get_devices() )
|
||||||
dev_list.push_back( dev );
|
dev_list.push_back( dev );
|
||||||
#endif
|
#endif
|
||||||
#ifdef ENABLE_BLADERF
|
#ifdef ENABLE_BLADERF
|
||||||
BOOST_FOREACH( std::string dev, bladerf_source_c::get_devices() )
|
BOOST_FOREACH( std::string dev, bladerf_source_c::get_devices() )
|
||||||
dev_list.push_back( dev );
|
dev_list.push_back( dev );
|
||||||
#endif
|
#endif
|
||||||
#ifdef ENABLE_RFSPACE
|
#ifdef ENABLE_RFSPACE
|
||||||
BOOST_FOREACH( std::string dev, rfspace_source_c::get_devices() )
|
BOOST_FOREACH( std::string dev, rfspace_source_c::get_devices() )
|
||||||
dev_list.push_back( dev );
|
dev_list.push_back( dev );
|
||||||
#endif
|
#endif
|
||||||
#ifdef ENABLE_HACKRF
|
#ifdef ENABLE_HACKRF
|
||||||
BOOST_FOREACH( std::string dev, hackrf_source_c::get_devices() )
|
BOOST_FOREACH( std::string dev, hackrf_source_c::get_devices() )
|
||||||
dev_list.push_back( dev );
|
dev_list.push_back( dev );
|
||||||
#endif
|
#endif
|
||||||
#ifdef ENABLE_AIRSPY
|
#ifdef ENABLE_AIRSPY
|
||||||
BOOST_FOREACH( std::string dev, airspy_source_c::get_devices() )
|
BOOST_FOREACH( std::string dev, airspy_source_c::get_devices() )
|
||||||
dev_list.push_back( dev );
|
dev_list.push_back( dev );
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// std::cerr << std::endl;
|
// std::cerr << std::endl;
|
||||||
// BOOST_FOREACH( std::string dev, dev_list )
|
// BOOST_FOREACH( std::string dev, dev_list )
|
||||||
// std::cerr << "'" << dev << "'" << std::endl;
|
// std::cerr << "'" << dev << "'" << std::endl;
|
||||||
|
|
||||||
if (!device_specified) {
|
|
||||||
if ( dev_list.size() )
|
if ( dev_list.size() )
|
||||||
arg_list.push_back( dev_list.front() );
|
arg_list.push_back( dev_list.front() );
|
||||||
else
|
else
|
||||||
|
|
Loading…
Reference in New Issue