X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=gr-audio-portaudio%2Fsrc%2Faudio_portaudio_sink.h;h=0e082c5e29932930e4413bd13b765d2f10cc757a;hb=5a4b9ba9af590b2a269cb3e5872c85faa7c284d1;hp=0a0022930f878772de6c55627223778741e0e36a;hpb=86f5c92427b3f4bb30536d76cf63c3fca388fb2f;p=debian%2Fgnuradio

diff --git a/gr-audio-portaudio/src/audio_portaudio_sink.h b/gr-audio-portaudio/src/audio_portaudio_sink.h
index 0a002293..0e082c5e 100644
--- a/gr-audio-portaudio/src/audio_portaudio_sink.h
+++ b/gr-audio-portaudio/src/audio_portaudio_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,
@@ -24,7 +24,7 @@
 
 #include <gr_sync_block.h>
 #include <gr_buffer.h>
-#include <omnithread.h>
+#include <gnuradio/omnithread.h>
 #include <string>
 #include <portaudio.h>
 #include <stdexcept>
@@ -34,14 +34,15 @@ class audio_portaudio_sink;
 typedef boost::shared_ptr<audio_portaudio_sink> audio_portaudio_sink_sptr;
 
 /*!
- * \PORTAUDIO audio sink.
+ * \brief PORTAUDIO audio sink.
+ *
  * \param sampling_rate	sampling rate in Hz
- * \param dev PORTAUDIO device name, e.g., "pa:"
+ * \param device_name PORTAUDIO device name, e.g., "pa:"
  * \param ok_to_block	true if it's ok for us to block
  */
 audio_portaudio_sink_sptr
 audio_portaudio_make_sink (int sampling_rate,
-			   const std::string dev = "",
+			   const std::string device_name = "",
 			   bool ok_to_block = true);
 
 PaStreamCallback portaudio_sink_callback;