Merge branch 'master' into constell_obj

Conflicts:
	gnuradio-core/src/lib/filter/gr_pfb_clock_sync_ccf.h
	gr-audio-oss/src/Makefile.swig.gen
	gr-audio/swig/Makefile.swig.gen

3 files changed, 119 insertions, 0 deletions

diff --git a/gnuradio-examples/c++/audio/.gitignore b/gnuradio-examples/c++/audio/.gitignore
new file mode 100644
index 000000000..bb08aaf91
--- /dev/null
+++ b/gnuradio-examples/c++/audio/.gitignore
@@ -0,0 +1,3 @@
+/Makefile
+/Makefile.in
+/dial_tone
diff --git a/gnuradio-examples/c++/audio/Makefile.am b/gnuradio-examples/c++/audio/Makefile.am
new file mode 100644
index 000000000..88bd7c1fd
--- /dev/null
+++ b/gnuradio-examples/c++/audio/Makefile.am
@@ -0,0 +1,38 @@
+#
+# Copyright 2011 Free Software Foundation, Inc.
+# 
+# This file is part of GNU Radio
+# 
+# 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 3, or (at your option)
+# any later version.
+# 
+# GNU Radio is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with GNU Radio; see the file COPYING.  If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
+# 
+
+include $(top_srcdir)/Makefile.common
+
+# For compiling with the GNU Radio build tree, use include dir below.
+# For compiling outside the tree, use 'pkg-config --cflags gnuradio-audio'
+AM_CPPFLAGS = \
+	-I$(top_srcdir)/gr-audio/include \
+	$(STD_DEFINES_AND_INCLUDES) \
+	$(WITH_INCLUDES)
+
+# For compiling within the GNU Radio build tree, link against GR_AUDIO_LA
+# For compiling outside the tree, use 'pkg-config --libs gnuradio-audio'
+GR_AUDIO_LA=$(top_builddir)/gr-audio/lib/libgnuradio-audio.la
+
+noinst_PROGRAMS = dial_tone
+
+dial_tone_SOURCES = dial_tone.cc
+dial_tone_LDADD = $(GNURADIO_CORE_LA) $(GR_AUDIO_LA)
diff --git a/gnuradio-examples/c++/audio/dial_tone.cc b/gnuradio-examples/c++/audio/dial_tone.cc
new file mode 100644
index 000000000..e4e3d8ceb
--- /dev/null
+++ b/gnuradio-examples/c++/audio/dial_tone.cc
@@ -0,0 +1,78 @@
+/*
+ * Copyright 2011 Free Software Foundation, Inc.
+ * 
+ * This file is part of GNU Radio
+ * 
+ * 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 3, or (at your option)
+ * any later version.
+ * 
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+
+/*
+ * GNU Radio C++ example creating dial tone
+ * ("the simplest thing that could possibly work")
+ *
+ * Send a tone each to the left and right channels of stereo audio
+ * output and let the user's brain sum them.
+ *
+ * GNU Radio makes extensive use of Boost shared pointers.  Signal processing
+ * blocks are typically created by calling a "make" factory function, which
+ * returns an instance of the block as a typedef'd shared pointer that can
+ * be used in any way a regular pointer can.  Shared pointers created this way
+ * keep track of their memory and free it at the right time, so the user
+ * doesn't need to worry about it (really).
+ *
+ */
+
+// Include header files for each block used in flowgraph
+#include <gr_top_block.h>
+#include <gr_sig_source_f.h>
+#include <gr_audio_sink.h>
+
+int main(int argc, char **argv)
+{
+  int rate = 48000;		// Audio card sample rate
+  float ampl = 0.1;		// Don't exceed 0.5 or clipping will occur
+
+  // Construct a top block that will contain flowgraph blocks.  Alternatively,
+  // one may create a derived class from gr_top_block and hold instantiated blocks
+  // as member data for later manipulation.
+  gr_top_block_sptr tb = gr_make_top_block("dial_tone");
+
+  // Construct a real-valued signal source for each tone, at given sample rate
+  gr_sig_source_f_sptr src0 = gr_make_sig_source_f(rate, GR_SIN_WAVE, 350, ampl);
+  gr_sig_source_f_sptr src1 = gr_make_sig_source_f(rate, GR_SIN_WAVE, 440, ampl);
+
+  // Construct an audio sink to accept audio tones
+  audio_sink::sptr sink = audio_make_sink(rate);
+
+  // Connect output #0 of src0 to input #0 of sink (left channel)
+  tb->connect(src0, 0, sink, 0);
+
+  // Connect output #0 of src1 to input #1 of sink (right channel)
+  tb->connect(src1, 0, sink, 1);
+
+  // Tell GNU Radio runtime to start flowgraph threads; the foreground thread
+  // will block until either flowgraph exits (this example doesn't) or the
+  // application receives SIGINT (e.g., user hits CTRL-C).
+  //
+  // Real applications may use tb->start() which returns, allowing the foreground
+  // thread to proceed, then later use tb->stop(), followed by tb->wait(), to cleanup
+  // GNU Radio before exiting.
+  tb->run();
+
+  // Exit normally.
+  return 0;
+}