projects
/
debian
/
gnuradio
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Convert gr-audio-portaudio to Boost via gruel
[debian/gnuradio]
/
gr-audio-portaudio
/
src
/
audio_portaudio_source.h
diff --git
a/gr-audio-portaudio/src/audio_portaudio_source.h
b/gr-audio-portaudio/src/audio_portaudio_source.h
index 3102db739c8a41a497d583ed718ef988480c137a..31e70a12779b257f2c72078c6d881cef9cbc119e 100644
(file)
--- a/
gr-audio-portaudio/src/audio_portaudio_source.h
+++ b/
gr-audio-portaudio/src/audio_portaudio_source.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
*
@@
-24,11
+24,10
@@
#include <gr_sync_block.h>
#include <gr_buffer.h>
#include <gr_sync_block.h>
#include <gr_buffer.h>
-#include <g
nuradio/omni
thread.h>
+#include <g
ruel/
thread.h>
#include <string>
#include <portaudio.h>
#include <stdexcept>
#include <string>
#include <portaudio.h>
#include <stdexcept>
-//#include <gri_logger.h>
class audio_portaudio_source;
typedef boost::shared_ptr<audio_portaudio_source> audio_portaudio_source_sptr;
class audio_portaudio_source;
typedef boost::shared_ptr<audio_portaudio_source> audio_portaudio_source_sptr;
@@
-74,11
+73,13
@@
class audio_portaudio_source : public gr_sync_block {
gr_buffer_sptr d_writer; // buffer used between work and callback
gr_buffer_reader_sptr d_reader;
gr_buffer_sptr d_writer; // buffer used between work and callback
gr_buffer_reader_sptr d_reader;
- omni_semaphore d_ringbuffer_ready; // binary semaphore
+
+ gruel::mutex d_ringbuffer_mutex;
+ gruel::condition_variable d_ringbuffer_cond;
+ bool d_ringbuffer_ready;
// random stats
int d_noverruns; // count of overruns
// random stats
int d_noverruns; // count of overruns
- //gri_logger_sptr d_log; // handle to non-blocking logging instance
void output_error_msg (const char *msg, int err);
void bail (const char *msg, int err) throw (std::runtime_error);
void output_error_msg (const char *msg, int err);
void bail (const char *msg, int err) throw (std::runtime_error);
@@
-87,7
+88,7
@@
class audio_portaudio_source : public gr_sync_block {
protected:
audio_portaudio_source (int sampling_rate, const std::string device_name,
protected:
audio_portaudio_source (int sampling_rate, const std::string device_name,
- bool ok_to_block);
+
bool ok_to_block);
public:
~audio_portaudio_source ();
public:
~audio_portaudio_source ();