projects
/
debian
/
gnuradio
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream' into dfsg-orig
[debian/gnuradio]
/
gr-audio-osx
/
src
/
audio_osx_sink.h
diff --git
a/gr-audio-osx/src/audio_osx_sink.h
b/gr-audio-osx/src/audio_osx_sink.h
index ceb291d0fb1214a1df45d627d05bd68c09b10a39..a1a56502cb8d19a4805ae4b2076726f0e879579f 100644
(file)
--- a/
gr-audio-osx/src/audio_osx_sink.h
+++ b/
gr-audio-osx/src/audio_osx_sink.h
@@
-1,6
+1,6
@@
/* -*- c++ -*- */
/*
/* -*- c++ -*- */
/*
- * Copyright 2006 Free Software Foundation, Inc.
+ * Copyright 2006
,2010
Free Software Foundation, Inc.
*
* This file is part of GNU Radio.
*
*
* This file is part of GNU Radio.
*
@@
-59,8
+59,8
@@
class audio_osx_sink : public gr_sync_block {
UInt32 d_n_channels;
UInt32 d_queueSampleCount, d_max_sample_count;
bool d_do_block;
UInt32 d_n_channels;
UInt32 d_queueSampleCount, d_max_sample_count;
bool d_do_block;
-
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
circular_buffer<float>** d_buffers;
// AudioUnits and Such