diff options
| author | Johnathan Corgan | 2010-04-26 13:05:03 -0700 |
|---|---|---|
| committer | Johnathan Corgan | 2010-04-26 13:05:03 -0700 |
| commit | 665d7a850eeb46bfc6388a98e4a4107648cb6add (patch) | |
| tree | 722736b80651cd2b6fbde49c7859af50b94d3621 /gr-audio-osx/src/audio_osx_source.h | |
| parent | a3278070d3e991ea0a8f6e62bbfc2a2e177fe8e7 (diff) | |
| parent | a40feb1dece1b8064f3f81e669f3ed38b60b6dd8 (diff) | |
| download | gnuradio-665d7a850eeb46bfc6388a98e4a4107648cb6add.tar.gz gnuradio-665d7a850eeb46bfc6388a98e4a4107648cb6add.tar.bz2 gnuradio-665d7a850eeb46bfc6388a98e4a4107648cb6add.zip | |
Merge branch 'wip/remove-mld-threads'
* wip/remove-mld-threads:
Further updates for removing omnithreads
Update build configuration for OSX omnithreads changeover
initial move from mld_threads to gruel:: namespace threads and such
Initial changes to remove mld_thread and instead use gruel:: namespace classes
Diffstat (limited to 'gr-audio-osx/src/audio_osx_source.h')
| -rw-r--r-- | gr-audio-osx/src/audio_osx_source.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gr-audio-osx/src/audio_osx_source.h b/gr-audio-osx/src/audio_osx_source.h index 780f7ec6b..e8df47b16 100644 --- a/gr-audio-osx/src/audio_osx_source.h +++ b/gr-audio-osx/src/audio_osx_source.h @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2006 Free Software Foundation, Inc. + * Copyright 2006,2010 Free Software Foundation, Inc. * * This file is part of GNU Radio. * @@ -66,8 +66,8 @@ class audio_osx_source : public gr_sync_block { UInt32 d_n_AvailableInputFrames, d_n_ActualInputFrames; UInt32 d_n_user_channels, d_n_max_channels, d_n_deviceChannels; bool d_do_block, d_passThrough, d_waiting_for_data; - mld_mutex_ptr d_internal; - mld_condition_ptr d_cond_data; + gruel::mutex* d_internal; + gruel::condition_variable* d_cond_data; circular_buffer<float>** d_buffers; // AudioUnits and Such |