diff options
| author | Don Ward | 2010-04-30 17:00:33 -0400 |
|---|---|---|
| committer | Don Ward | 2010-04-30 17:00:33 -0400 |
| commit | dda6ed353551d3493983bd56e0ca8ee8ed4407c5 (patch) | |
| tree | ad6e304c1843953ca88dd944bda4498b5fe62570 /gr-audio-osx/src/audio_osx_source.h | |
| parent | 04d3f1954b589656b34298b98e36b8667700d89a (diff) | |
| parent | 9038b3530d0ec746f401f3c443e2f862fff5a18e (diff) | |
| download | gnuradio-dda6ed353551d3493983bd56e0ca8ee8ed4407c5.tar.gz gnuradio-dda6ed353551d3493983bd56e0ca8ee8ed4407c5.tar.bz2 gnuradio-dda6ed353551d3493983bd56e0ca8ee8ed4407c5.zip | |
Merge branch 'master' into udp
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 |