4 files changed, 13 insertions, 13 deletions
diff --git a/gr-audio/lib/portaudio/portaudio_sink.cc b/gr-audio/lib/portaudio/portaudio_sink.cc
index d1a3f5166c..746894e494 100644
--- a/gr-audio/lib/portaudio/portaudio_sink.cc
+++ b/gr-audio/lib/portaudio/portaudio_sink.cc
@@ -100,7 +100,7 @@ namespace gr {
 
       if(nreqd_samples <= navail_samples) {  // We've got enough data...
         {
-          gruel::scoped_lock guard(self->d_ringbuffer_mutex);
+          gr::thread::scoped_lock guard(self->d_ringbuffer_mutex);
 
           memcpy(outputBuffer,
                  self->d_reader->read_pointer(),
@@ -313,7 +313,7 @@ namespace gr {
         if(nframes == 0) {      // no room...
           if(d_ok_to_block) {
             {
-              gruel::scoped_lock guard(d_ringbuffer_mutex);
+              gr::thread::scoped_lock guard(d_ringbuffer_mutex);
               while(!d_ringbuffer_ready)
                 d_ringbuffer_cond.wait(guard);
             }
@@ -331,7 +331,7 @@ namespace gr {
 
         // We can write the smaller of the request and the room we've got
         {
-          gruel::scoped_lock guard(d_ringbuffer_mutex);
+          gr::thread::scoped_lock guard(d_ringbuffer_mutex);
 
           int nf = std::min(noutput_items - k, nframes);
           float *p = (float*)d_writer->write_pointer();
diff --git a/gr-audio/lib/portaudio/portaudio_sink.h b/gr-audio/lib/portaudio/portaudio_sink.h
index 41a725b691..e69f96b252 100644
--- a/gr-audio/lib/portaudio/portaudio_sink.h
+++ b/gr-audio/lib/portaudio/portaudio_sink.h
@@ -24,7 +24,7 @@
 
 #include <audio/sink.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
diff --git a/gr-audio/lib/portaudio/portaudio_source.cc b/gr-audio/lib/portaudio/portaudio_source.cc
index 937c1d0dbf..500d3109e5 100644
--- a/gr-audio/lib/portaudio/portaudio_source.cc
+++ b/gr-audio/lib/portaudio/portaudio_source.cc
@@ -103,7 +103,7 @@ namespace gr {
 
         // copy from input buffer to ringbuffer
         {
-          gruel::scoped_lock(d_ringbuffer_mutex);
+          gr::thread::scoped_lock(d_ringbuffer_mutex);
 
           memcpy(self->d_writer->write_pointer(),
                  inputBuffer,
@@ -305,7 +305,7 @@ namespace gr {
             return k;
 
           if(d_ok_to_block) {
-            gruel::scoped_lock guard(d_ringbuffer_mutex);
+            gr::thread::scoped_lock guard(d_ringbuffer_mutex);
             while(d_ringbuffer_ready == false)
               d_ringbuffer_cond.wait(guard);  // block here, then try again
             continue;
@@ -324,7 +324,7 @@ namespace gr {
 
           // Fill with some frames of zeros
           {
-            gruel::scoped_lock guard(d_ringbuffer_mutex);
+            gr::thread::scoped_lock guard(d_ringbuffer_mutex);
 
             int nf = std::min(noutput_items - k, (int)d_portaudio_buffer_size_frames);
             for(int i = 0; i < nf; i++) {
@@ -341,7 +341,7 @@ namespace gr {
 
         // We can read the smaller of the request and what's in the buffer.
         {
-          gruel::scoped_lock guard(d_ringbuffer_mutex);
+          gr::thread::scoped_lock guard(d_ringbuffer_mutex);
 
           int nf = std::min(noutput_items - k, nframes);
 
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