diff options
| author | Johnathan Corgan | 2010-05-11 18:00:19 -0700 |
|---|---|---|
| committer | Johnathan Corgan | 2010-05-11 18:00:19 -0700 |
| commit | c1c29651e8a13c090228723684d6f693a6ae8c34 (patch) | |
| tree | 7f38fa94a51e68be60243e5a2bd3bb3acc1e700d /gr-audio-osx/src/audio_osx_source.h | |
| parent | c76897abcbfe1c149bffd27fba0224d3ebc83503 (diff) | |
| parent | 1fc7c57f778a9f05ded1d216247242ee13632d03 (diff) | |
| download | gnuradio-c1c29651e8a13c090228723684d6f693a6ae8c34.tar.gz gnuradio-c1c29651e8a13c090228723684d6f693a6ae8c34.tar.bz2 gnuradio-c1c29651e8a13c090228723684d6f693a6ae8c34.zip | |
Merge branch 'master' into wip/burx_support
* master: (39 commits)
Add gru.hexshort to deal with short hex constants
Assign USB PID for Hans de Bok
Add missing buffer allocator hint to gr_ofdm_sampler.cc
Really fix the missing include for boost::bind
gr-wxgui: Added additional color table entries
Missed updates for omnithread/mblock removal
Remove omnithreads library.
Remove mblock library. We hardly knew 'ye.
Convert gr-audio-portaudio to Boost via gruel
Further updates for removing omnithreads
Update build configuration for OSX omnithreads changeover
Add missing include file for boost::bind
Convert gcell to use boost::threads instead of omnithread.
Fix sequence error indication after stopping then restarting streaming on USRP2.
initial move from mld_threads to gruel:: namespace threads and such
Initial changes to remove mld_thread and instead use gruel:: namespace classes
Fixing doxygen warnings from arb_resampler. Also, removed set_taps from public
Fixing doxygen warnings from channelizer block.
Fixing documentation to get rid of doxygen warnings.
Adding documentation for fff version of othe PFB clock sync algorithm.
...
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 |