diff options
| author | Martin Braun <martin.braun@ettus.com> | 2020-01-05 22:10:32 -0800 |
|---|---|---|
| committer | Marcus Müller <marcus@hostalia.de> | 2020-01-06 13:36:36 +0100 |
| commit | 4846be906ad2d4b9d60dfae07f3c4dc6dd95fa95 (patch) | |
| tree | 7cbeb4dde0c0b8cbdb2217998654f7f579f0e1e0 | |
| parent | 2cc67c0c0bcca248bbda347630620341aaff508d (diff) | |
digital: pfb clock sync: Remove deprecated set_taps() API call
This API call was deprecated a long time ago and contained a warning
that it will be removed, so we're now being true to our promise.
This also fixes a compiler error in SWIG *if* you have old headers
installed that SWIG will find (instead of the ones in the source tree).
| -rw-r--r-- | gr-digital/include/gnuradio/digital/pfb_clock_sync_ccf.h | 12 | ||||
| -rw-r--r-- | gr-digital/include/gnuradio/digital/pfb_clock_sync_fff.h | 12 | ||||
| -rw-r--r-- | gr-digital/lib/pfb_clock_sync_ccf_impl.h | 8 | ||||
| -rw-r--r-- | gr-digital/lib/pfb_clock_sync_fff_impl.h | 8 |
4 files changed, 8 insertions, 32 deletions
diff --git a/gr-digital/include/gnuradio/digital/pfb_clock_sync_ccf.h b/gr-digital/include/gnuradio/digital/pfb_clock_sync_ccf.h index ed6c083ff9..a64cf06d86 100644 --- a/gr-digital/include/gnuradio/digital/pfb_clock_sync_ccf.h +++ b/gr-digital/include/gnuradio/digital/pfb_clock_sync_ccf.h @@ -193,18 +193,6 @@ public: virtual void update_taps(const std::vector<float>& taps) = 0; /*! - * Used to set the taps of the filters in the filterbank and - * differential filterbank. - * - * WARNING: this should not be used externally and will be moved - * to a private function in the next API. - */ - virtual void - set_taps(const std::vector<float>& taps, - std::vector<std::vector<float>>& ourtaps, - std::vector<std::unique_ptr<gr::filter::kernel::fir_filter_ccf>>& ourfilter) = 0; - - /*! * Returns all of the taps of the matched filter */ virtual std::vector<std::vector<float>> taps() const = 0; diff --git a/gr-digital/include/gnuradio/digital/pfb_clock_sync_fff.h b/gr-digital/include/gnuradio/digital/pfb_clock_sync_fff.h index 03151826a2..ea1e746385 100644 --- a/gr-digital/include/gnuradio/digital/pfb_clock_sync_fff.h +++ b/gr-digital/include/gnuradio/digital/pfb_clock_sync_fff.h @@ -192,18 +192,6 @@ public: virtual void update_taps(const std::vector<float>& taps) = 0; /*! - * Used to set the taps of the filters in the filterbank and - * differential filterbank. - * - * WARNING: this should not be used externally and will be moved - * to a private function in the next API. - */ - virtual void - set_taps(const std::vector<float>& taps, - std::vector<std::vector<float>>& ourtaps, - std::vector<gr::filter::kernel::fir_filter_fff*>& ourfilter) = 0; - - /*! * Returns all of the taps of the matched filter */ virtual std::vector<std::vector<float>> taps() const = 0; diff --git a/gr-digital/lib/pfb_clock_sync_ccf_impl.h b/gr-digital/lib/pfb_clock_sync_ccf_impl.h index 2384123af8..eecd65c587 100644 --- a/gr-digital/lib/pfb_clock_sync_ccf_impl.h +++ b/gr-digital/lib/pfb_clock_sync_ccf_impl.h @@ -63,6 +63,10 @@ private: void create_diff_taps(const std::vector<float>& newtaps, std::vector<float>& difftaps); + void set_taps(const std::vector<float>& taps, + std::vector<std::vector<float>>& ourtaps, + std::vector<std::unique_ptr<kernel::fir_filter_ccf>>& ourfilter); + public: pfb_clock_sync_ccf_impl(double sps, float loop_bw, @@ -80,10 +84,6 @@ public: void update_taps(const std::vector<float>& taps); - void set_taps(const std::vector<float>& taps, - std::vector<std::vector<float>>& ourtaps, - std::vector<std::unique_ptr<kernel::fir_filter_ccf>>& ourfilter) override; - std::vector<std::vector<float>> taps() const; std::vector<std::vector<float>> diff_taps() const; std::vector<float> channel_taps(int channel) const; diff --git a/gr-digital/lib/pfb_clock_sync_fff_impl.h b/gr-digital/lib/pfb_clock_sync_fff_impl.h index 2441edd424..f9acb778cd 100644 --- a/gr-digital/lib/pfb_clock_sync_fff_impl.h +++ b/gr-digital/lib/pfb_clock_sync_fff_impl.h @@ -61,6 +61,10 @@ private: void create_diff_taps(const std::vector<float>& newtaps, std::vector<float>& difftaps); + void set_taps(const std::vector<float>& taps, + std::vector<std::vector<float>>& ourtaps, + std::vector<kernel::fir_filter_fff*>& ourfilter); + public: pfb_clock_sync_fff_impl(double sps, float gain, @@ -77,10 +81,6 @@ public: void update_taps(const std::vector<float>& taps); - void set_taps(const std::vector<float>& taps, - std::vector<std::vector<float>>& ourtaps, - std::vector<kernel::fir_filter_fff*>& ourfilter); - std::vector<std::vector<float>> taps() const; std::vector<std::vector<float>> diff_taps() const; std::vector<float> channel_taps(int channel) const; |