diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2015-04-15 14:03:44 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2015-04-15 14:03:44 -0700 |
| commit | 527c21cb6a3b1b32610c4acf0bec8956ace2c5bf (patch) | |
| tree | 5fdb9e755f77d2493d8851f956b074c6f11cb8ce /gr-blocks/lib/ctrlport_probe2_c_impl.h | |
| parent | 7765798c48b9ec4b1cda43367e97eb778a8ad758 (diff) | |
| parent | b092142302bcf8c771ec68e61da7781eb406c86f (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'gr-blocks/lib/ctrlport_probe2_c_impl.h')
| -rw-r--r-- | gr-blocks/lib/ctrlport_probe2_c_impl.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/gr-blocks/lib/ctrlport_probe2_c_impl.h b/gr-blocks/lib/ctrlport_probe2_c_impl.h index 15ff0f4ea2..fa74216202 100644 --- a/gr-blocks/lib/ctrlport_probe2_c_impl.h +++ b/gr-blocks/lib/ctrlport_probe2_c_impl.h @@ -25,7 +25,7 @@ #include <gnuradio/blocks/ctrlport_probe2_c.h> #include <gnuradio/rpcregisterhelpers.h> -#include <boost/thread/shared_mutex.hpp> +#include <gnuradio/rpcbufferedget.h> namespace gr { namespace blocks { @@ -37,11 +37,9 @@ namespace gr { std::string d_desc; size_t d_len; unsigned int d_disp_mask; - boost::shared_mutex mutex_buffer; - mutable boost::mutex mutex_notify; - boost::condition_variable condition_buffer_ready; std::vector<gr_complex> d_buffer; + rpcbufferedget< std::vector<gr_complex> > buffered_get; public: ctrlport_probe2_c_impl(const std::string &id, const std::string &desc, @@ -66,4 +64,3 @@ namespace gr { } /* namespace gr */ #endif /* INCLUDED_CTRLPORT_PROBE2_C_IMPL_H */ - |