diff options
| author | jcorgan | 2009-07-25 17:39:00 +0000 |
|---|---|---|
| committer | jcorgan | 2009-07-25 17:39:00 +0000 |
| commit | 4b4da4852482546157abbf8589f2a85bac6c3509 (patch) | |
| tree | 02ffd52e5138661205d4c771c11fb759a079650c /gr-audio-portaudio/src/audio_portaudio_sink.cc | |
| parent | 1ea9f1bb015a543a60fb5f89c49c8093d7e069d6 (diff) | |
| download | gnuradio-4b4da4852482546157abbf8589f2a85bac6c3509.tar.gz gnuradio-4b4da4852482546157abbf8589f2a85bac6c3509.tar.bz2 gnuradio-4b4da4852482546157abbf8589f2a85bac6c3509.zip | |
Merge r11462:11485 from jcorgan/omni into trunk.
Removes dependency on omnithreads from gnuradio-core.
Trunk passes distcheck.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@11486 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'gr-audio-portaudio/src/audio_portaudio_sink.cc')
| -rw-r--r-- | gr-audio-portaudio/src/audio_portaudio_sink.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/gr-audio-portaudio/src/audio_portaudio_sink.cc b/gr-audio-portaudio/src/audio_portaudio_sink.cc index cfdc6302a..2e48feb4a 100644 --- a/gr-audio-portaudio/src/audio_portaudio_sink.cc +++ b/gr-audio-portaudio/src/audio_portaudio_sink.cc @@ -35,7 +35,7 @@ #include <gnuradio/omnithread.h> #include <string.h> -#define LOGGING 0 // define to 0 or 1 +//#define LOGGING 0 // define to 0 or 1 #define SAMPLE_FORMAT paFloat32 typedef float sample_t; @@ -85,8 +85,8 @@ portaudio_sink_callback (const void *inputBuffer, int navail_samples = self->d_reader->items_available(); if (nreqd_samples <= navail_samples){ // We've got enough data... - if (LOGGING) - self->d_log->printf("PAsink cb: f/b = %4ld\n", framesPerBuffer); + //if (LOGGING) + // self->d_log->printf("PAsink cb: f/b = %4ld\n", framesPerBuffer); // copy from ringbuffer into output buffer memcpy(outputBuffer, self->d_reader->read_pointer(), @@ -99,8 +99,8 @@ portaudio_sink_callback (const void *inputBuffer, } else { // underrun - if (LOGGING) - self->d_log->printf("PAsink cb: f/b = %4ld UNDERRUN\n", framesPerBuffer); + //if (LOGGING) + // self->d_log->printf("PAsink cb: f/b = %4ld UNDERRUN\n", framesPerBuffer); self->d_nunderuns++; ::write(2, "aU", 2); // FIXME change to non-blocking call @@ -139,8 +139,8 @@ audio_portaudio_sink::audio_portaudio_sink(int sampling_rate, d_nunderuns(0) { memset(&d_output_parameters, 0, sizeof(d_output_parameters)); - if (LOGGING) - d_log = gri_logger::singleton(); + //if (LOGGING) + // d_log = gri_logger::singleton(); PaError err; int i, numDevices; |