Merge branch 'maint' of gnuradio.org:gnuradio into maint

24 files changed, 76 insertions, 23 deletions

diff --git a/ChangeLog b/ChangeLog
index af3c825fb..170a7f7d1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,7 +19,6 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-For the blow by blow changes for each file, please consult
-http://gnuradio.org/trac/timeline
-	
-It's got everything that used to be in here ;)
+For the blow by blow changes for each file, please consult:
+
+http://gnuradio.org/redmine/projects/gnuradio/repository
diff --git a/gnuradio-core/src/lib/filter/gr_dc_blocker_cc.h b/gnuradio-core/src/lib/filter/gr_dc_blocker_cc.h
index de9ccc0ea..d299cc7ef 100644
--- a/gnuradio-core/src/lib/filter/gr_dc_blocker_cc.h
+++ b/gnuradio-core/src/lib/filter/gr_dc_blocker_cc.h
@@ -79,7 +79,6 @@ class gr_dc_blocker_cc : public gr_sync_block
    * Build the DC blocker.
    * \param D          (int) the length of the delay line
    * \param long_form  (bool) whether to use long (true, default) or short form
-   * \param channel (unsigned integer) Selects the channel to return [default=0].
    */
   friend gr_dc_blocker_cc_sptr gr_make_dc_blocker_cc (int D, bool long_form);
 
diff --git a/gnuradio-core/src/lib/filter/gr_dc_blocker_ff.h b/gnuradio-core/src/lib/filter/gr_dc_blocker_ff.h
index b632d81da..8ffb6cf6f 100644
--- a/gnuradio-core/src/lib/filter/gr_dc_blocker_ff.h
+++ b/gnuradio-core/src/lib/filter/gr_dc_blocker_ff.h
@@ -79,7 +79,6 @@ class gr_dc_blocker_ff : public gr_sync_block
    * Build the DC blocker.
    * \param D          (int) the length of the delay line
    * \param long_form  (bool) whether to use long (true, default) or short form
-   * \param channel (unsigned integer) Selects the channel to return [default=0].
    */
   friend gr_dc_blocker_ff_sptr gr_make_dc_blocker_ff (int D, bool long_form);
 
diff --git a/gnuradio-core/src/lib/filter/gri_goertzel.cc b/gnuradio-core/src/lib/filter/gri_goertzel.cc
index 85e66c069..73b8366ab 100644
--- a/gnuradio-core/src/lib/filter/gri_goertzel.cc
+++ b/gnuradio-core/src/lib/filter/gri_goertzel.cc
@@ -20,6 +20,9 @@
  * Boston, MA 02110-1301, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <cmath>
 
 #include <gri_goertzel.h>
diff --git a/gnuradio-core/src/lib/filter/qa_gri_mmse_fir_interpolator.cc b/gnuradio-core/src/lib/filter/qa_gri_mmse_fir_interpolator.cc
index 63654a280..d158ff00d 100644
--- a/gnuradio-core/src/lib/filter/qa_gri_mmse_fir_interpolator.cc
+++ b/gnuradio-core/src/lib/filter/qa_gri_mmse_fir_interpolator.cc
@@ -20,6 +20,10 @@
  * Boston, MA 02110-1301, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <cppunit/TestAssert.h>
 #include <qa_gri_mmse_fir_interpolator.h>
 #include <gri_mmse_fir_interpolator.h>
diff --git a/gnuradio-core/src/lib/general/gr_circular_file.cc b/gnuradio-core/src/lib/general/gr_circular_file.cc
index c9222597a..4d88b9d99 100644
--- a/gnuradio-core/src/lib/general/gr_circular_file.cc
+++ b/gnuradio-core/src/lib/general/gr_circular_file.cc
@@ -42,6 +42,10 @@
 #include <stdio.h>
 #include <string.h>
 
+#ifdef HAVE_IO_H
+#include <io.h>
+#endif
+
 static const int HEADER_SIZE = 4096;
 static const int HEADER_MAGIC = 0xEB021026;
 
diff --git a/gnuradio-core/src/lib/general/gr_firdes.cc b/gnuradio-core/src/lib/general/gr_firdes.cc
index 5d192d67e..13110d57d 100644
--- a/gnuradio-core/src/lib/general/gr_firdes.cc
+++ b/gnuradio-core/src/lib/general/gr_firdes.cc
@@ -20,6 +20,10 @@
  * Boston, MA 02110-1301, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <gr_firdes.h>
 #include <stdexcept>
 
diff --git a/gnuradio-core/src/lib/general/gr_random.cc b/gnuradio-core/src/lib/general/gr_random.cc
index 67f760006..52140acc2 100644
--- a/gnuradio-core/src/lib/general/gr_random.cc
+++ b/gnuradio-core/src/lib/general/gr_random.cc
@@ -35,6 +35,9 @@
  * 
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <math.h>
 #include <gr_random.h>
 
diff --git a/gnuradio-core/src/lib/general/gri_float_to_char.cc b/gnuradio-core/src/lib/general/gri_float_to_char.cc
index a17b01f55..28f15a3b3 100644
--- a/gnuradio-core/src/lib/general/gri_float_to_char.cc
+++ b/gnuradio-core/src/lib/general/gri_float_to_char.cc
@@ -20,6 +20,10 @@
  * Boston, MA 02110-1301, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #define _ISOC9X_SOURCE
 #include <gri_float_to_char.h>
 #include <math.h>
diff --git a/gnuradio-core/src/lib/general/gri_float_to_short.cc b/gnuradio-core/src/lib/general/gri_float_to_short.cc
index 13afc51d9..93a2784f5 100644
--- a/gnuradio-core/src/lib/general/gri_float_to_short.cc
+++ b/gnuradio-core/src/lib/general/gri_float_to_short.cc
@@ -20,6 +20,10 @@
  * Boston, MA 02110-1301, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #define _ISOC9X_SOURCE
 #include <gri_float_to_short.h>
 #include <math.h>
diff --git a/gnuradio-core/src/lib/general/gri_float_to_uchar.cc b/gnuradio-core/src/lib/general/gri_float_to_uchar.cc
index 394cbc100..a022c95d8 100644
--- a/gnuradio-core/src/lib/general/gri_float_to_uchar.cc
+++ b/gnuradio-core/src/lib/general/gri_float_to_uchar.cc
@@ -20,6 +20,10 @@
  * Boston, MA 02110-1301, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #define _ISOC9X_SOURCE
 #include <gri_float_to_uchar.h>
 #include <math.h>
diff --git a/gnuradio-core/src/lib/io/gr_file_descriptor_sink.cc b/gnuradio-core/src/lib/io/gr_file_descriptor_sink.cc
index 09fb6c826..11e0a8eb9 100644
--- a/gnuradio-core/src/lib/io/gr_file_descriptor_sink.cc
+++ b/gnuradio-core/src/lib/io/gr_file_descriptor_sink.cc
@@ -34,6 +34,9 @@
 #include <stdexcept>
 #include <stdio.h>
 
+#ifdef HAVE_IO_H
+#include <io.h>
+#endif
 
 gr_file_descriptor_sink::gr_file_descriptor_sink (size_t itemsize, int fd)
   : gr_sync_block ("file_descriptor_sink",
diff --git a/gnuradio-core/src/lib/io/gr_file_descriptor_source.cc b/gnuradio-core/src/lib/io/gr_file_descriptor_source.cc
index 700ad4aef..334a57848 100644
--- a/gnuradio-core/src/lib/io/gr_file_descriptor_source.cc
+++ b/gnuradio-core/src/lib/io/gr_file_descriptor_source.cc
@@ -35,6 +35,9 @@
 #include <stdio.h>
 #include <string.h>
 
+#ifdef HAVE_IO_H
+#include <io.h>
+#endif
 
 gr_file_descriptor_source::gr_file_descriptor_source (size_t itemsize,
 						      int fd,
diff --git a/gnuradio-core/src/lib/io/gr_tagged_file_sink.cc b/gnuradio-core/src/lib/io/gr_tagged_file_sink.cc
index 154611c32..91618bad6 100644
--- a/gnuradio-core/src/lib/io/gr_tagged_file_sink.cc
+++ b/gnuradio-core/src/lib/io/gr_tagged_file_sink.cc
@@ -34,6 +34,10 @@
 #include <iostream>
 #include <gr_tag_info.h>
 
+#ifdef HAVE_IO_H
+#include <io.h>
+#endif
+
 #ifdef O_BINARY
 #define	OUR_O_BINARY O_BINARY
 #else
diff --git a/gnuradio-core/src/lib/io/gri_wavfile.cc b/gnuradio-core/src/lib/io/gri_wavfile.cc
index b8375edc2..8f1c6a2bb 100644
--- a/gnuradio-core/src/lib/io/gri_wavfile.cc
+++ b/gnuradio-core/src/lib/io/gri_wavfile.cc
@@ -160,25 +160,25 @@ gri_wavheader_parse(FILE *fp,
     return false;
   }
   
-  fread(&file_size, 1, 4, fp);
+  fresult = fread(&file_size, 1, 4, fp);
   
   fresult = fread(str_buf, 1, 8, fp);
   if (fresult != 8 || strncmp(str_buf, "WAVEfmt ", 8) || feof(fp)) {
     return false;
   }
   
-  fread(&fmt_hdr_skip, 1, 4, fp);
+  fresult = fread(&fmt_hdr_skip, 1, 4, fp);
   
-  fread(&compression_type, 1, 2, fp);
+  fresult = fread(&compression_type, 1, 2, fp);
   if (wav_to_host(compression_type) != VALID_COMPRESSION_TYPE) {
     return false;
   }
   
-  fread(&nchans,            1, 2, fp);
-  fread(&sample_rate,       1, 4, fp);
-  fread(&avg_bytes_per_sec, 1, 4, fp);
-  fread(&block_align,       1, 2, fp);
-  fread(&bits_per_sample,   1, 2, fp);
+  fresult = fread(&nchans,            1, 2, fp);
+  fresult = fread(&sample_rate,       1, 4, fp);
+  fresult = fread(&avg_bytes_per_sec, 1, 4, fp);
+  fresult = fread(&block_align,       1, 2, fp);
+  fresult = fread(&bits_per_sample,   1, 2, fp);
   
   if (ferror(fp)) {
     return false;
@@ -204,7 +204,7 @@ gri_wavheader_parse(FILE *fp,
     return false;
   }
 
-  fread(&chunk_size, 1, 4, fp);
+  fresult = fread(&chunk_size, 1, 4, fp);
   if (ferror(fp)) {
     return false;
   }
@@ -226,7 +226,9 @@ short int
 gri_wav_read_sample(FILE *fp, int bytes_per_sample)
 {
   int16_t buf = 0;
-  fread(&buf, bytes_per_sample, 1, fp);
+  size_t fresult;
+
+  fresult = fread(&buf, bytes_per_sample, 1, fp);
   
   return (short) wav_to_host(buf);
 }
diff --git a/gnuradio-core/src/lib/io/microtune_xxxx_eval_board.cc b/gnuradio-core/src/lib/io/microtune_xxxx_eval_board.cc
index 668f04cad..14f2b8589 100644
--- a/gnuradio-core/src/lib/io/microtune_xxxx_eval_board.cc
+++ b/gnuradio-core/src/lib/io/microtune_xxxx_eval_board.cc
@@ -20,6 +20,10 @@
  * Boston, MA 02110-1301, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "microtune_xxxx_eval_board.h"
 #include "microtune_eval_board_defs.h"
 #include "microtune_xxxx.h"
diff --git a/gr-audio/lib/Makefile.am b/gr-audio/lib/Makefile.am
index 2bec73ff0..ee2247aa6 100644
--- a/gr-audio/lib/Makefile.am
+++ b/gr-audio/lib/Makefile.am
@@ -122,6 +122,11 @@ if GR_AUDIO_OSX_SUPPORT
 AM_CPPFLAGS += \
 	-I$(srcdir)/osx
 
+libgnuradio_audio_la_LDFLAGS += \
+       -framework AudioUnit    \
+       -framework CoreAudio    \
+       -framework AudioToolbox
+
 libgnuradio_audio_la_SOURCES += \
 	osx/audio_osx_source.cc \
 	osx/audio_osx_sink.cc
diff --git a/gr-audio/lib/alsa/audio_alsa_source.cc b/gr-audio/lib/alsa/audio_alsa_source.cc
index 4f0042b22..2f4506f71 100644
--- a/gr-audio/lib/alsa/audio_alsa_source.cc
+++ b/gr-audio/lib/alsa/audio_alsa_source.cc
@@ -217,8 +217,14 @@ audio_alsa_source::check_topology (int ninputs, int noutputs)
   unsigned int nchan = noutputs;
   int err;
 
-  // FIXME check_topology may be called more than once.
+  // Check the state of the stream
   // Ensure that the pcm is in a state where we can still mess with the hw_params
+  snd_pcm_state_t state;
+  state=snd_pcm_state(d_pcm_handle);
+  if ( state== SND_PCM_STATE_RUNNING)
+    return true;  // If stream is running, don't change any parameters
+  else if(state == SND_PCM_STATE_XRUN )
+    snd_pcm_prepare ( d_pcm_handle ); // Prepare stream on underrun, and we can set parameters;
 
   bool special_case = nchan == 1 && d_special_case_stereo_to_mono;
   if (special_case)
diff --git a/gr-pager/lib/pager_flex_sync.cc b/gr-pager/lib/pager_flex_sync.cc
index 61cf4ad38..30666298f 100644
--- a/gr-pager/lib/pager_flex_sync.cc
+++ b/gr-pager/lib/pager_flex_sync.cc
@@ -274,7 +274,7 @@ int pager_flex_sync::general_work(int noutput_items,
 
     while (i < ninputs && j < noutput_items) {
         unsigned char sym = *in++; i++;
-        d_index = ++d_index % d_spb;
+	d_index = (d_index+1) % d_spb;
     
         switch (d_state) {
             case ST_IDLE:
diff --git a/gr-trellis/src/lib/trellis_pccc_decoder_X.h.t b/gr-trellis/src/lib/trellis_pccc_decoder_X.h.t
index ff4b7a1f8..2a5b43df6 100644
--- a/gr-trellis/src/lib/trellis_pccc_decoder_X.h.t
+++ b/gr-trellis/src/lib/trellis_pccc_decoder_X.h.t
@@ -50,9 +50,9 @@ typedef boost::shared_ptr<@NAME@> @SPTR_NAME@;
 class @NAME@ : public gr_block
 {
   fsm d_FSM1;
-  fsm d_FSM2;
   int d_ST10;
   int d_ST1K;
+  fsm d_FSM2;
   int d_ST20;
   int d_ST2K;
   interleaver d_INTERLEAVER;
diff --git a/gr-trellis/src/lib/trellis_sccc_decoder_X.h.t b/gr-trellis/src/lib/trellis_sccc_decoder_X.h.t
index 3adb8a5b7..93c9ac9b8 100644
--- a/gr-trellis/src/lib/trellis_sccc_decoder_X.h.t
+++ b/gr-trellis/src/lib/trellis_sccc_decoder_X.h.t
@@ -50,9 +50,9 @@ typedef boost::shared_ptr<@NAME@> @SPTR_NAME@;
 class @NAME@ : public gr_block
 {
   fsm d_FSMo;
-  fsm d_FSMi;
   int d_STo0;
   int d_SToK;
+  fsm d_FSMi;
   int d_STi0;
   int d_STiK;
   interleaver d_INTERLEAVER;
diff --git a/gr-trellis/src/lib/trellis_sccc_decoder_combined_XX.h.t b/gr-trellis/src/lib/trellis_sccc_decoder_combined_XX.h.t
index 146c26516..225a07ffe 100644
--- a/gr-trellis/src/lib/trellis_sccc_decoder_combined_XX.h.t
+++ b/gr-trellis/src/lib/trellis_sccc_decoder_combined_XX.h.t
@@ -55,9 +55,9 @@ typedef boost::shared_ptr<@NAME@> @SPTR_NAME@;
 class @NAME@ : public gr_block
 {
   fsm d_FSMo;
-  fsm d_FSMi;
   int d_STo0;
   int d_SToK;
+  fsm d_FSMi;
   int d_STi0;
   int d_STiK;
   interleaver d_INTERLEAVER;
diff --git a/gr-uhd/include/gr_uhd_usrp_sink.h b/gr-uhd/include/gr_uhd_usrp_sink.h
index 320d07d41..2adc5f1bf 100644
--- a/gr-uhd/include/gr_uhd_usrp_sink.h
+++ b/gr-uhd/include/gr_uhd_usrp_sink.h
@@ -125,7 +125,6 @@ public:
 
     /*!
      * Get the actual dboard gain setting of named stage.
-     * \param name the name of the gain stage
      * \param chan the channel index 0 to N-1
      * \return the actual gain in dB
      */
diff --git a/volk/include/volk/volk_complex.h b/volk/include/volk/volk_complex.h
index b20b5cf47..f2fd17342 100644
--- a/volk/include/volk/volk_complex.h
+++ b/volk/include/volk/volk_complex.h
@@ -2,7 +2,7 @@
 #define INCLUDE_VOLK_COMPLEX_H
 
 /*!
-  \brief This header file is to prevent issues with having <complex> and <complex.h> variables in the same code as the gcc compiler does not allow that
+  \brief This header file is to prevent issues with having "complex" and "complex.h" variables in the same code as the gcc compiler does not allow that
 */
 #ifdef __cplusplus