Reverting last change in alsa.

[debian/gnuradio] / gr-audio-alsa / src / audio_alsa_sink.h

diff --git a/gr-audio-alsa/src/audio_alsa_sink.h b/gr-audio-alsa/src/audio_alsa_sink.h
index f2aa80aea8b3201000280b9192ecd90aad423cd4..f3007f60f8a0503040873966c613776feea07d45 100644 (file)
--- a/gr-audio-alsa/src/audio_alsa_sink.h
+++ b/gr-audio-alsa/src/audio_alsa_sink.h
@@ -40,12 +40,12 @@ typedef boost::shared_ptr<audio_alsa_sink> audio_alsa_sink_sptr;
  * \brief make an alsa audio sink.
  *
  * \param sampling_rate        sampling rate in Hz
- * \param dev ALSA pcm device name, e.g., "hw:0,0"
+ * \param device_name ALSA pcm device name, e.g., "hw:0,0"
  * \param ok_to_block (currently ignored)
  */
 audio_alsa_sink_sptr
 audio_alsa_make_sink (int sampling_rate,
-                     const std::string dev = "",
+                     const std::string device_name = "",
                      bool ok_to_block = true);
 
 /*!
@@ -83,6 +83,7 @@ class audio_alsa_sink : public gr_sync_block {
   // random stats
   int                  d_nunderuns;            // count of underruns
   int                  d_nsuspends;            // count of suspends
+  bool                 d_ok_to_block;      // defaults to "true", controls blocking/non-block I/O
 
   void output_error_msg (const char *msg, int err);
   void bail (const char *msg, int err) throw (std::runtime_error);