Merge remote branch 'gnuradio/next'

* gnuradio/next: (806 commits)
  gruel: added missing ignores
  gruel: fixed swig interface file to dereference pmt_t.
  qtgui: fix distcheck error
  gruel: fixing structure. Passes make check.
  gruel: SWIGing Gruel into Python to access PMTs.
  gnuradio-examples: add C++ audio examples using new gr-audio
  created gruel/attributes.h to house compiler specific attribute macros
  audio: remove obsoleted individual top-level components
  gr-audio: added README and default config fix
  volk: simplify the get new method for the aligned pool
  grc: moved all usrp1 and usrp2 stuff out of grc and into gr-usrp*/grc
  grc: swap store the subprocess object rather than the pid when executing
  qtgui: removed python directory that was added, never used
  uhd: use %ignore to hide warnings and fix errors
  Added/updated ignore files.
  Fixing gr_filter_design program to import from gnuradio Python package.
  audio: high prio for platform specific audio osx
  audio: added windows and osx audio source files
  audio: added config checks for other audios, added jack and port
  audio: make prefs look like old audio, removed old audio.py
  ...

6 files changed, 0 insertions, 177 deletions

diff --git a/gnuradio-examples/c++/dial_tone/.gitignore b/gnuradio-examples/c++/dial_tone/.gitignore
deleted file mode 100644
index c5e345858..000000000
--- a/gnuradio-examples/c++/dial_tone/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/.deps
-/.libs
-/Makefile
-/Makefile.in
-/dial_tone
diff --git a/gnuradio-examples/c++/dial_tone/Makefile.am b/gnuradio-examples/c++/dial_tone/Makefile.am
deleted file mode 100644
index 188275fca..000000000
--- a/gnuradio-examples/c++/dial_tone/Makefile.am
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# Copyright 2006,2008,2009,2010 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 within the GNU Radio build tree
-AM_CPPFLAGS = \
-	-I$(top_srcdir)/gr-audio-alsa/src \
-	$(STD_DEFINES_AND_INCLUDES) \
-	$(WITH_INCLUDES)
-
-GR_AUDIO_ALSA_LA=$(top_builddir)/gr-audio-alsa/src/libgnuradio-audio-alsa.la
-
-# For compiling outside the tree, these will get fished out by pkgconfig
-
-noinst_PROGRAMS = dial_tone
-
-noinst_HEADERS = \
-    dial_tone.h
-
-dial_tone_SOURCES = \
-    dial_tone.cc	   \
-    main.cc
-
-dial_tone_LDADD = \
-    $(GNURADIO_CORE_LA) \
-    $(GR_AUDIO_ALSA_LA)
diff --git a/gnuradio-examples/c++/dial_tone/README b/gnuradio-examples/c++/dial_tone/README
deleted file mode 100644
index 6d5ed5059..000000000
--- a/gnuradio-examples/c++/dial_tone/README
+++ /dev/null
@@ -1,16 +0,0 @@
-This example requires that gr-audio-alsa be built in the main tree in order
-to compile successfully.  It is not built automatically.
-
-To build this example, you must make two modifications to the build system:
-
-1) Add the following line inside config/grc_gnuradio_examples.m4:
-
-   gnuradio-examples/c++/dial_tone/Makefile
-   
-   ...to the list of Makefiles already in there.
-   
-2) In gnuradio-examples/c++/Makefile.am, uncomment the SUBDIRS line
-
-# SUBDIRS = dial_tone
-
-Then, from the top-level directory, re-run ./bootstrap and ./configure.
\ No newline at end of file
diff --git a/gnuradio-examples/c++/dial_tone/dial_tone.cc b/gnuradio-examples/c++/dial_tone/dial_tone.cc
deleted file mode 100644
index 9a2772a18..000000000
--- a/gnuradio-examples/c++/dial_tone/dial_tone.cc
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright 2006,2008 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 <dial_tone.h>
-#include <gr_io_signature.h>
-#include <gr_sig_source_f.h>
-#include <audio_alsa_sink.h>
-
-// Shared pointer constructor
-dial_tone_sptr make_dial_tone()
-{
-  return gnuradio::get_initial_sptr(new dial_tone());
-}
-
-// Hierarchical block constructor, with no inputs or outputs
-dial_tone::dial_tone() : 
-    gr_top_block("dial_tone")
-{
-    gr_sig_source_f_sptr src0 = gr_make_sig_source_f(48000, GR_SIN_WAVE, 350, 0.1);
-    gr_sig_source_f_sptr src1 = gr_make_sig_source_f(48000, GR_SIN_WAVE, 440, 0.1);
-    audio_alsa_sink_sptr sink = audio_alsa_make_sink(48000);
-
-    connect(src0, 0, sink, 0);
-    connect(src1, 0, sink, 1);
-}
diff --git a/gnuradio-examples/c++/dial_tone/dial_tone.h b/gnuradio-examples/c++/dial_tone/dial_tone.h
deleted file mode 100644
index c645439bb..000000000
--- a/gnuradio-examples/c++/dial_tone/dial_tone.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright 2006 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 <gr_top_block.h>
-
-class dial_tone;
-typedef boost::shared_ptr<dial_tone> dial_tone_sptr;
-dial_tone_sptr make_dial_tone();
-
-class dial_tone : public gr_top_block
-{
-private:
-    dial_tone();
-    friend dial_tone_sptr make_dial_tone();
-};
diff --git a/gnuradio-examples/c++/dial_tone/main.cc b/gnuradio-examples/c++/dial_tone/main.cc
deleted file mode 100644
index a09bd8288..000000000
--- a/gnuradio-examples/c++/dial_tone/main.cc
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright 2006 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++ application
-//
-// Instantiate a top block
-// Instantiate a runtime, passing it the top block
-// Tell the runtime to go...
-
-#include <dial_tone.h>
-
-int main()
-{
-    dial_tone_sptr top_block = make_dial_tone();
-    top_block->run();   
-    return 0;
-}