summaryrefslogtreecommitdiff
path: root/gr-audio/lib/osx/osx_source.cc
diff options
context:
space:
mode:
authorBen Reynwar <ben@reynwar.net>2013-04-02 23:04:08 -0700
committerBen Reynwar <ben@reynwar.net>2013-04-02 23:04:08 -0700
commitc6dbde23b256a41b3d92cb4ad6b63287095d53c7 (patch)
tree71db12ea2e1667770c22568dcdf5e0857d5f1e59 /gr-audio/lib/osx/osx_source.cc
parent22b70d0889ef3c51e27a31ee18d153093a55cbb8 (diff)
parent98758cbfa9a2aff714952d19e773bc370dfa2185 (diff)
Merged next into uninstalled import branch.
Diffstat (limited to 'gr-audio/lib/osx/osx_source.cc')
-rw-r--r--gr-audio/lib/osx/osx_source.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/gr-audio/lib/osx/osx_source.cc b/gr-audio/lib/osx/osx_source.cc
index c79a6ec6e9..c666bb7ad8 100644
--- a/gr-audio/lib/osx/osx_source.cc
+++ b/gr-audio/lib/osx/osx_source.cc
@@ -484,12 +484,12 @@ namespace gr {
// create the stuff to regulate I/O
- d_cond_data = new gruel::condition_variable();
+ d_cond_data = new gr::thread::condition_variable();
if(d_cond_data == NULL)
CheckErrorAndThrow(errno, "new condition (data)",
"audio_osx_source::audio_osx_source");
- d_internal = new gruel::mutex();
+ d_internal = new gr::thread::mutex();
if(d_internal == NULL)
CheckErrorAndThrow(errno, "new mutex (internal)",
"audio_osx_source::audio_osx_source");
@@ -687,7 +687,7 @@ namespace gr {
gr_vector_void_star &output_items)
{
// acquire control to do processing here only
- gruel::scoped_lock l(*d_internal);
+ gr::thread::scoped_lock l(*d_internal);
#if _OSX_AU_DEBUG_
std::cerr << "work1: SC = " << d_queueSampleCount
@@ -806,7 +806,7 @@ namespace gr {
OSStatus err = noErr;
osx_source* This = static_cast<osx_source*>(inRefCon);
- gruel::scoped_lock l(*This->d_internal);
+ gr::thread::scoped_lock l(*This->d_internal);
#if _OSX_AU_DEBUG_
std::cerr << "cb0: in#F = " << inNumberFrames