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/osx/osx_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/osx/osx_source.cc')
| -rw-r--r-- | gr-audio/lib/osx/osx_source.cc | 8 |
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 |