diff --git a/CMakeLists.txt b/CMakeLists.txt index 3d981fce8..df2acd779 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -137,7 +137,7 @@ else() endif() include(FindPkgConfig) -find_package(Gnuradio-osmosdr REQUIRED) + set(GR_REQUIRED_COMPONENTS RUNTIME ANALOG AUDIO BLOCKS DIGITAL FILTER FFT PMT SOAPY) find_package(Gnuradio REQUIRED COMPONENTS analog audio blocks digital filter fft network soapy) diff --git a/src/applications/gqrx/receiver.cpp b/src/applications/gqrx/receiver.cpp index 1289ad896..bdf4358f2 100644 --- a/src/applications/gqrx/receiver.cpp +++ b/src/applications/gqrx/receiver.cpp @@ -28,9 +28,9 @@ #include #include -#include + #include -#include + #include #include "applications/gqrx/receiver.h" @@ -229,19 +229,10 @@ void receiver::set_input_device(const std::string device) tb->disconnect(soapy_src, 0, iq_swap, 0); } -#if GNURADIO_VERSION < 0x030802 - //Work around GNU Radio bug #3184 - //temporarily connect dummy source to ensure that previous device is closed - src = osmosdr::source::make("file="+escape_filename(get_zero_file())+",freq=428e6,rate=96000,repeat=true,throttle=true"); - tb->connect(src, 0, iq_swap, 0); - tb->start(); - tb->stop(); - tb->wait(); - tb->disconnect(src, 0, iq_swap, 0); -#else + //src.reset(); soapy_src.reset(); -#endif + try { @@ -1305,8 +1296,10 @@ receiver::status receiver::stop_iq_recording() receiver::status receiver::seek_iq_file(long pos) { receiver::status status = STATUS_OK; + status = STATUS_ERROR; + return status; - tb->lock(); + /* tb->lock(); if (src->seek(pos, SEEK_SET)) { @@ -1319,7 +1312,7 @@ receiver::status receiver::seek_iq_file(long pos) tb->unlock(); - return status; + return status; */ } /** diff --git a/src/applications/gqrx/receiver.h b/src/applications/gqrx/receiver.h index bb3eea22c..bc5ea5e20 100644 --- a/src/applications/gqrx/receiver.h +++ b/src/applications/gqrx/receiver.h @@ -29,7 +29,7 @@ #include #include #include -#include + #include #include @@ -258,7 +258,7 @@ class receiver gr::top_block_sptr tb; /*!< The GNU Radio top block. */ - osmosdr::source::sptr src; /*!< Real time I/Q source. */ + //osmosdr::source::sptr src; /*!< Real time I/Q source. */ gr::soapy::source::sptr soapy_src; /*!< SoapySDR source. */ diff --git a/src/qtgui/ioconfig.cpp b/src/qtgui/ioconfig.cpp index be0e214e7..d81b1d520 100644 --- a/src/qtgui/ioconfig.cpp +++ b/src/qtgui/ioconfig.cpp @@ -29,9 +29,7 @@ #include #include -#include -#include -#include + #include