Merge commit 'v3.3.0' into upstream

[debian/gnuradio] / gr-audio-osx / src / audio_osx_source.h

diff --git a/gr-audio-osx/src/audio_osx_source.h b/gr-audio-osx/src/audio_osx_source.h
index 780f7ec6b809bbcc02f761957133cdc2d3b4591d..e8df47b16fb15ad2c5fbd3d7a49542f80fd6c1f0 100644 (file)
--- 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