projects
/
debian
/
gnuradio
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'v3.3.1' into try-3.3.1
[debian/gnuradio]
/
gr-audio-portaudio
/
src
/
audio_portaudio_source.cc
diff --git
a/gr-audio-portaudio/src/audio_portaudio_source.cc
b/gr-audio-portaudio/src/audio_portaudio_source.cc
index 484b7f1e541bb42c86d84937c801ec61319b8c2f..e508fda22f6d1aa8f708459465654b92439ac6e5 100644
(file)
--- a/
gr-audio-portaudio/src/audio_portaudio_source.cc
+++ b/
gr-audio-portaudio/src/audio_portaudio_source.cc
@@
-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
*
@@
-105,7
+105,10
@@
portaudio_source_callback (const void *inputBuffer,
else { // overrun
self->d_noverruns++;
else { // overrun
self->d_noverruns++;
- ::write(2, "aO", 2); // FIXME change to non-blocking call
+ ssize_t r = ::write(2, "aO", 2); // FIXME change to non-blocking call
+ if(r == -1) {
+ perror("audio_portaudio_source::portaudio_source_callback write error to stderr.");
+ }
self->d_ringbuffer_ready = false;
self->d_ringbuffer_cond.notify_one(); // Tell the sink to get going!
self->d_ringbuffer_ready = false;
self->d_ringbuffer_cond.notify_one(); // Tell the sink to get going!
@@
-119,7
+122,7
@@
portaudio_source_callback (const void *inputBuffer,
audio_portaudio_source_sptr
audio_portaudio_make_source (int sampling_rate, const std::string dev, bool ok_to_block)
{
audio_portaudio_source_sptr
audio_portaudio_make_source (int sampling_rate, const std::string dev, bool ok_to_block)
{
- return
audio_portaudio_source_sptr
(new audio_portaudio_source (sampling_rate,
+ return
gnuradio::get_initial_sptr
(new audio_portaudio_source (sampling_rate,
dev, ok_to_block));
}
dev, ok_to_block));
}