diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2013-04-02 16:02:33 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2013-04-02 16:02:33 -0700 |
| commit | eea870b1dd9c5b90dfa7d94e6a15ffe44cfbee7f (patch) | |
| tree | af3aa889c94cff9c503edefeaf19cb3635693bfb /gr-audio/lib/portaudio/portaudio_source.h | |
| parent | e648165dcc7609524681b5eaf9620798b75b8420 (diff) | |
| parent | 9acf35715fbb8aca5a991a3f41965db8f4cde683 (diff) | |
Merge branch 'runtime-gruel' into next
Conflicts:
gnuradio-runtime/lib/CMakeLists.txt
Diffstat (limited to 'gr-audio/lib/portaudio/portaudio_source.h')
| -rw-r--r-- | gr-audio/lib/portaudio/portaudio_source.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gr-audio/lib/portaudio/portaudio_source.h b/gr-audio/lib/portaudio/portaudio_source.h index d4f4f01d1f..6a3419b613 100644 --- a/gr-audio/lib/portaudio/portaudio_source.h +++ b/gr-audio/lib/portaudio/portaudio_source.h @@ -25,7 +25,7 @@ #include <audio/source.h> #include <gr_buffer.h> -#include <gruel/thread.h> +#include <thread/thread.h> #include <string> #include <portaudio.h> #include <stdexcept> @@ -58,8 +58,8 @@ namespace gr { gr_buffer_sptr d_writer; // buffer used between work and callback gr_buffer_reader_sptr d_reader; - gruel::mutex d_ringbuffer_mutex; - gruel::condition_variable d_ringbuffer_cond; + gr::thread::mutex d_ringbuffer_mutex; + gr::thread::condition_variable d_ringbuffer_cond; bool d_ringbuffer_ready; // random stats |