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.cc | |
| 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.cc')
| -rw-r--r-- | gr-audio/lib/portaudio/portaudio_source.cc | 8 |
1 files changed, 4 insertions, 4 deletions
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); |