Merge branch 'master' of gnuradio.org:gnuradio

2 files changed, 7 insertions, 5 deletions

diff --git a/gnuradio-core/src/lib/gengen/gr_fastnoise_source_X.h.t b/gnuradio-core/src/lib/gengen/gr_fastnoise_source_X.h.t
index fab3e776f..007e44975 100644
--- a/gnuradio-core/src/lib/gengen/gr_fastnoise_source_X.h.t
+++ b/gnuradio-core/src/lib/gengen/gr_fastnoise_source_X.h.t
@@ -39,6 +39,7 @@ typedef boost::shared_ptr<@NAME@> @NAME@_sptr;
  * \param ampl  a scaling factor for the output
  * \param seed seed for random generators. Note that for uniform and
  * Gaussian distributions, this should be a negative number.
+ * \param samples number of samples to pre-generate.
  */
 GR_CORE_API @NAME@_sptr
 gr_make_@BASE_NAME@ (gr_noise_type_t type, float ampl, long seed = 0, long samples=1024*16);
@@ -55,6 +56,7 @@ gr_make_@BASE_NAME@ (gr_noise_type_t type, float ampl, long seed = 0, long sampl
  * \param ampl  a scaling factor for the output
  * \param seed seed for random generators. Note that for uniform and
  * Gaussian distributions, this should be a negative number.
+ * \param samples number of samples to pre-generate.
  */
 class GR_CORE_API @NAME@ : public gr_sync_block {
   friend GR_CORE_API @NAME@_sptr
diff --git a/gnuradio-core/src/lib/io/gr_file_source.cc b/gnuradio-core/src/lib/io/gr_file_source.cc
index 09f3986cd..f3def0721 100644
--- a/gnuradio-core/src/lib/io/gr_file_source.cc
+++ b/gnuradio-core/src/lib/io/gr_file_source.cc
@@ -89,7 +89,7 @@ gr_file_source::work (int noutput_items,
   if(d_fp == NULL)
     throw std::runtime_error("work with file not open");
 
-  boost::mutex::scoped_lock lock(fp_mutex); // hold for the rest of this function
+  gruel::scoped_lock lock(fp_mutex); // hold for the rest of this function
   while (size) {
     i = fread(o, d_itemsize, size, (FILE *) d_fp);
 
@@ -129,7 +129,7 @@ bool
 gr_file_source::seek (long seek_point, int whence)
 {
   // obtain exclusive access for duration of this function
-  boost::mutex::scoped_lock lock(fp_mutex);
+  gruel::scoped_lock lock(fp_mutex);
   return fseek((FILE *) d_fp, seek_point * d_itemsize, whence) == 0;
 }
 
@@ -137,7 +137,7 @@ void
 gr_file_source::open(const char *filename, bool repeat)
 {
   // obtain exclusive access for duration of this function
-  boost::mutex::scoped_lock     lock(fp_mutex);
+  gruel::scoped_lock     lock(fp_mutex);
 
   int fd;
 
@@ -166,7 +166,7 @@ void
 gr_file_source::close()
 {
   // obtain exclusive access for duration of this function
-  boost::mutex::scoped_lock lock(fp_mutex);
+  gruel::scoped_lock lock(fp_mutex);
 
   if(d_new_fp != NULL) {
     fclose(d_new_fp);
@@ -179,7 +179,7 @@ void
 gr_file_source::do_update()
 {
   if(d_updated) {
-    boost::mutex::scoped_lock lock(fp_mutex); // hold while in scope
+    gruel::scoped_lock lock(fp_mutex); // hold while in scope
 
     if(d_fp)
       fclose(d_fp);