Merge branch 'maint'

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

diff --git a/gr-audio-alsa/src/audio_alsa_source.h b/gr-audio-alsa/src/audio_alsa_source.h
index 23f77bb1eeb40fedbeba7a545f05f87d70744922..db6c456839501cced28d29521f1afbee5053f38b 100644 (file)
--- a/gr-audio-alsa/src/audio_alsa_source.h
+++ b/gr-audio-alsa/src/audio_alsa_source.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,
@@ -39,12 +39,12 @@ typedef boost::shared_ptr<audio_alsa_source> audio_alsa_source_sptr;
  * \brief Make an ALSA audio source.
  *
  * \param sampling_rate        sampling rate
- * \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_source_sptr
 audio_alsa_make_source (int sampling_rate,
-                       const std::string dev = "",
+                       const std::string device_name = "",
                        bool ok_to_block = true);
 
 /*!