Imported Upstream version 3.2.2

[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 3d83ae3cf8a95ab103ed9879a3c1431c3be0e2f6..d4b540382e766d8568e65bd5f812aa33abe08250 100644 (file)
--- a/gr-audio-alsa/src/audio_alsa_sink.h
+++ b/gr-audio-alsa/src/audio_alsa_sink.h
@@ -6,7 +6,7 @@
  * 
  * GNU Radio is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
+ * the Free Software Foundation; either version 3, or (at your option)
  * any later version.
  * 
  * GNU Radio is distributed in the hope that it will be useful,
@@ -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);
 
 /*!