audio: remove obsoleted individual top-level components

12 files changed, 0 insertions, 1094 deletions

diff --git a/gr-audio-jack/src/.gitignore b/gr-audio-jack/src/.gitignore
deleted file mode 100644
index 347796beb..000000000
--- a/gr-audio-jack/src/.gitignore
+++ /dev/null
@@ -1,15 +0,0 @@
-/Makefile
-/Makefile.in
-/.la
-/.lo
-/.deps
-/.libs
-/*.la
-/*.lo
-/*.pyc
-/audio_jack.cc
-/audio_jack.py
-/run_tests
-/gnuradio
-/guile
-/python
diff --git a/gr-audio-jack/src/Makefile.am b/gr-audio-jack/src/Makefile.am
deleted file mode 100644
index 9a0c8b9be..000000000
--- a/gr-audio-jack/src/Makefile.am
+++ /dev/null
@@ -1,75 +0,0 @@
-#
-# Copyright 2005,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
-include $(top_srcdir)/Makefile.swig
-
-TESTS =
-EXTRA_DIST += run_tests.in
-DISTCLEANFILES += run_tests
-
-# C/C++ headers get installed in ${prefix}/include/gnuradio
-grinclude_HEADERS =			\
-	audio_jack_sink.h		\
-	audio_jack_source.h
-
-noinst_HEADERS = 			\
-	gri_jack.h
-
-lib_LTLIBRARIES = libgnuradio-audio-jack.la
-
-libgnuradio_audio_jack_la_SOURCES = 	\
-	audio_jack_sink.cc		\
-	audio_jack_source.cc	\
-	gri_jack.cc
-
-libgnuradio_audio_jack_la_LIBADD =	\
-	$(GNURADIO_CORE_LA)		\
-	$(JACK_LIBS)
-
-libgnuradio_audio_jack_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS)
-
-noinst_PYTHON = 			\
-	qa_jack.py
-
-AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
-
-###################################
-# SWIG interfaces and libraries
-
-TOP_SWIG_IFILES = 			\
-	audio_jack.i
-
-# Install so that they end up available as:
-#   import gnuradio.audio_jack
-# This ends up at:
-#   ${prefix}/lib/python${python_version}/site-packages/gnuradio
-audio_jack_pythondir_category =		\
-	gnuradio
-
-# additional libraries for linking with the SWIG-generated library
-audio_jack_la_swig_libadd =		\
-	libgnuradio-audio-jack.la
-
-
-if PYTHON
-TESTS += run_tests
-endif
diff --git a/gr-audio-jack/src/Makefile.swig.gen b/gr-audio-jack/src/Makefile.swig.gen
deleted file mode 100644
index 9ca8140d4..000000000
--- a/gr-audio-jack/src/Makefile.swig.gen
+++ /dev/null
@@ -1,145 +0,0 @@
-# -*- Makefile -*-
-#
-# Copyright 2009 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.
-# 
-
-# Makefile.swig.gen for audio_jack.i
-
-## Default install locations for these files:
-##
-## Default location for the Python directory is:
-##  ${prefix}/lib/python${python_version}/site-packages/[category]/audio_jack
-## Default location for the Python exec directory is:
-##  ${exec_prefix}/lib/python${python_version}/site-packages/[category]/audio_jack
-##
-## The following can be overloaded to change the install location, but
-## this has to be done in the including Makefile.am -before-
-## Makefile.swig is included.
-
-audio_jack_pythondir_category ?= gnuradio/audio_jack
-audio_jack_pylibdir_category ?= $(audio_jack_pythondir_category)
-audio_jack_pythondir = $(pythondir)/$(audio_jack_pythondir_category)
-audio_jack_pylibdir = $(pyexecdir)/$(audio_jack_pylibdir_category)
-
-# The .so libraries for the guile modules get installed whereever guile
-# is installed, usually /usr/lib/guile/gnuradio/
-# FIXME: determince whether these should be installed with gnuradio.
-audio_jack_scmlibdir = $(libdir)
-
-# The scm files for the guile modules get installed where ever guile
-# is installed, usually /usr/share/guile/site/audio_jack
-# FIXME: determince whether these should be installed with gnuradio.
-audio_jack_scmdir = $(guiledir)
-
-## SWIG headers are always installed into the same directory.
-
-audio_jack_swigincludedir = $(swigincludedir)
-
-## This is a template file for a "generated" Makefile addition (in
-## this case, "Makefile.swig.gen").  By including the top-level
-## Makefile.swig, this file will be used to generate the SWIG
-## dependencies.  Assign the variable TOP_SWIG_FILES to be the list of
-## SWIG .i files to generated wrappings for; there can be more than 1
-## so long as the names are unique (no sorting is done on the
-## TOP_SWIG_FILES list). This file explicitly assumes that a SWIG .i
-## file will generate .cc, .py, and possibly .h files -- meaning that
-## all of these files will have the same base name (that provided for
-## the SWIG .i file).
-##
-## This code is setup to ensure parallel MAKE ("-j" or "-jN") does the
-## right thing.  For more info, see <
-## http://sources.redhat.com/automake/automake.html#Multiple-Outputs >
-
-## Other cleaned files: dependency files generated by SWIG or this Makefile
-
-MOSTLYCLEANFILES += $(DEPDIR)/*.S*
-
-## Various SWIG variables.  These can be overloaded in the including
-## Makefile.am by setting the variable value there, then including
-## Makefile.swig .
-
-audio_jack_swiginclude_HEADERS =		\
-	audio_jack.i			\
-	$(audio_jack_swiginclude_headers)
-
-if PYTHON
-audio_jack_pylib_LTLIBRARIES =		\
-	_audio_jack.la
-
-_audio_jack_la_SOURCES = 			\
-	python/audio_jack.cc		\
-	$(audio_jack_la_swig_sources)
-
-audio_jack_python_PYTHON =			\
-	audio_jack.py			\
-	$(audio_jack_python)
-
-_audio_jack_la_LIBADD =			\
-	$(STD_SWIG_LA_LIB_ADD)		\
-	$(audio_jack_la_swig_libadd)
-
-_audio_jack_la_LDFLAGS =			\
-	$(STD_SWIG_LA_LD_FLAGS)		\
-	$(audio_jack_la_swig_ldflags)
-
-_audio_jack_la_CXXFLAGS =			\
-	$(STD_SWIG_CXX_FLAGS)		\
-	-I$(top_builddir) 		\
-	$(audio_jack_la_swig_cxxflags)
-
-python/audio_jack.cc: audio_jack.py
-audio_jack.py: audio_jack.i
-
-# Include the python dependencies for this file
--include python/audio_jack.d
-
-endif		# end of if python
-
-if GUILE
-
-audio_jack_scmlib_LTLIBRARIES = 		\
-	libguile-gnuradio-audio_jack.la
-libguile_gnuradio_audio_jack_la_SOURCES =	\
-	guile/audio_jack.cc			\
-	$(audio_jack_la_swig_sources)
-nobase_audio_jack_scm_DATA = 		\
-	gnuradio/audio_jack.scm 		\
-	gnuradio/audio_jack-primitive.scm
-libguile_gnuradio_audio_jack_la_LIBADD = 	\
-	$(STD_SWIG_LA_LIB_ADD)		\
-	$(audio_jack_la_swig_libadd)
-libguile_gnuradio_audio_jack_la_LDFLAGS = 	\
-	$(STD_SWIG_LA_LD_FLAGS)		\
-	$(audio_jack_la_swig_ldflags)
-libguile_gnuradio_audio_jack_la_CXXFLAGS = 	\
-	$(STD_SWIG_CXX_FLAGS)		\
-	-I$(top_builddir) 		\
-	$(audio_jack_la_swig_cxxflags)
-
-guile/audio_jack.cc: gnuradio/audio_jack.scm
-gnuradio/audio_jack.scm: audio_jack.i
-gnuradio/audio_jack-primitive.scm: gnuradio/audio_jack.scm
-
-# Include the guile dependencies for this file
--include guile/audio_jack.d
-
-endif				# end of GUILE
-
-
diff --git a/gr-audio-jack/src/audio_jack.i b/gr-audio-jack/src/audio_jack.i
deleted file mode 100644
index 67747cb16..000000000
--- a/gr-audio-jack/src/audio_jack.i
+++ /dev/null
@@ -1,85 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2005,2009 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 "gnuradio.i"				// the common stuff
-
-%{
-#include "audio_jack_sink.h"
-#include "audio_jack_source.h"
-%}
-
-// ----------------------------------------------------------------
-
-GR_SWIG_BLOCK_MAGIC(audio_jack,source)
-
-audio_jack_source_sptr
-audio_jack_make_source (int sampling_rate,
-			const std::string dev = "",
-			bool ok_to_block = true
-			) throw (std::runtime_error);
-
-class audio_jack_source : public gr_sync_block {
-
- protected:
-  audio_jack_source (int sampling_rate,
-		     const std::string device_name,
-		     bool ok_to_block
-		     ) throw (std::runtime_error);
-
- public:
-  ~audio_jack_source ();
-
-  bool start();
-  bool stop();
-};
-
-// ----------------------------------------------------------------
-
-GR_SWIG_BLOCK_MAGIC(audio_jack,sink)
-
-audio_jack_sink_sptr
-audio_jack_make_sink (int sampling_rate,
-		      const std::string dev = "",
-		      bool ok_to_block = true
-		      ) throw (std::runtime_error);
-
-class audio_jack_sink : public gr_sync_block {
-
- protected:
-  audio_jack_sink (int sampling_rate,
-		   const std::string device_name,
-		   bool ok_to_block
-		   ) throw (std::runtime_error);
-
- public:
-  ~audio_jack_sink ();
-};
-
-#if SWIGGUILE
-%scheme %{
-(load-extension-global "libguile-gnuradio-audio_jack" "scm_init_gnuradio_audio_jack_module")
-%}
-
-%goops %{
-(use-modules (gnuradio gnuradio_core_runtime))
-%}
-#endif
diff --git a/gr-audio-jack/src/audio_jack_sink.cc b/gr-audio-jack/src/audio_jack_sink.cc
deleted file mode 100644
index f28fddc34..000000000
--- a/gr-audio-jack/src/audio_jack_sink.cc
+++ /dev/null
@@ -1,236 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2005,2006,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.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <audio_jack_sink.h>
-#include <gr_io_signature.h>
-#include <gr_prefs.h>
-#include <stdio.h>
-#include <iostream>
-#include <stdexcept>
-#include <gri_jack.h>
-
-#ifndef NO_PTHREAD
-#include <pthread.h>
-#endif
-
-typedef jack_default_audio_sample_t sample_t;
-
-
-// Number of jack buffers in the ringbuffer
-// TODO: make it to match at least the quantity of items passed by work()
-static const unsigned int N_BUFFERS = 16;
-
-static std::string 
-default_device_name ()
-{
-  return gr_prefs::singleton()->get_string("audio_jack", "default_output_device", "gr_sink");
-}
-
-int
-jack_sink_process (jack_nframes_t nframes, void *arg)
-{
-  audio_jack_sink *self = (audio_jack_sink *)arg;
-  unsigned int read_size = nframes*sizeof(sample_t);
-
-  if (jack_ringbuffer_read_space (self->d_ringbuffer) < read_size) {
-    self->d_nunderuns++;
-    // FIXME: move this fputs out, we shouldn't use blocking calls in process()
-    fputs ("jU", stderr);
-    return 0;
-  }
-
-  char *buffer = (char *) jack_port_get_buffer (self->d_jack_output_port, nframes);
-
-  jack_ringbuffer_read (self->d_ringbuffer, buffer, read_size);
-
-#ifndef NO_PTHREAD
-  // Tell the sink thread there is room in the ringbuffer.
-  // If it is already running, the lock will not be available.
-  // We can't wait here in the process() thread, but we don't
-  // need to signal in that case, because the sink thread will 
-  // check for room availability.
-
-  if (pthread_mutex_trylock (&self->d_jack_process_lock) == 0) {
-    pthread_cond_signal (&self->d_ringbuffer_ready);
-    pthread_mutex_unlock (&self->d_jack_process_lock);
-  }
-#endif
-
-  return 0;
-}
-
-// ----------------------------------------------------------------
-
-audio_jack_sink_sptr
-audio_jack_make_sink(int sampling_rate, const std::string dev, bool ok_to_block)
-{
-  return gnuradio::get_initial_sptr(new audio_jack_sink (sampling_rate, dev,
-						    ok_to_block));
-}
-
-audio_jack_sink::audio_jack_sink (int sampling_rate,
-				  const std::string device_name,
-				  bool ok_to_block)
-  : gr_sync_block ("audio_jack_sink",
-		   gr_make_io_signature (0, 0, 0),
-		   gr_make_io_signature (0, 0, 0)),
-    d_sampling_rate (sampling_rate),
-    d_device_name (device_name.empty() ? default_device_name() : device_name),
-    d_ok_to_block (ok_to_block),
-    d_jack_client (0),
-    d_ringbuffer (0),
-    d_nunderuns (0)
-{
-#ifndef NO_PTHREAD
-  pthread_cond_init(&d_ringbuffer_ready, NULL);;
-  pthread_mutex_init(&d_jack_process_lock, NULL);
-#endif
-  
-  // try to become a client of the JACK server
-  jack_options_t options = JackNullOption;
-  jack_status_t status;
-  const char *server_name = NULL;
-  if ((d_jack_client = jack_client_open (d_device_name.c_str (),
-  					 options, &status,
-					 server_name)) == NULL) {
-    fprintf (stderr, "audio_jack_sink[%s]: jack server not running?\n",
-	     d_device_name.c_str());
-    throw std::runtime_error ("audio_jack_sink");
-  }
-
-  // tell the JACK server to call `jack_sink_process()' whenever
-  // there is work to be done.
-  jack_set_process_callback (d_jack_client, &jack_sink_process, (void*)this);
-
-  // tell the JACK server to call `jack_shutdown()' if
-  // it ever shuts down, either entirely, or if it
-  // just decides to stop calling us.
-
-  //jack_on_shutdown (d_jack_client, &jack_shutdown, (void*)this);
- 
-  d_jack_output_port = 
-    jack_port_register (d_jack_client, "out", 
-			JACK_DEFAULT_AUDIO_TYPE, JackPortIsOutput, 0);
-
-
-  d_jack_buffer_size = jack_get_buffer_size (d_jack_client);
-
-  set_output_multiple (d_jack_buffer_size);
-
-  d_ringbuffer =
-    jack_ringbuffer_create (N_BUFFERS*d_jack_buffer_size*sizeof(sample_t));
-  if (d_ringbuffer == NULL)
-    bail ("jack_ringbuffer_create failed", 0);
-
-  assert(sizeof(float)==sizeof(sample_t));
-  set_input_signature (gr_make_io_signature (1, 1, sizeof (sample_t)));
-
-
-  jack_nframes_t sample_rate = jack_get_sample_rate (d_jack_client);
-
-  if ((jack_nframes_t)sampling_rate != sample_rate){
-    fprintf (stderr, "audio_jack_sink[%s]: unable to support sampling rate %d\n",
-	     d_device_name.c_str (), sampling_rate);
-    fprintf (stderr, "  card requested %d instead.\n", sample_rate);
-  }
-}
-
-
-bool
-audio_jack_sink::check_topology (int ninputs, int noutputs)
-{
-  if (ninputs != 1)
-    return false;
-
-  // tell the JACK server that we are ready to roll 
-  if (jack_activate (d_jack_client))
-    throw std::runtime_error ("audio_jack_sink");
-
-  return true;
-}
-
-audio_jack_sink::~audio_jack_sink ()
-{
-  jack_client_close (d_jack_client);
-  jack_ringbuffer_free (d_ringbuffer);
-}
-
-int
-audio_jack_sink::work (int noutput_items,
-		       gr_vector_const_void_star &input_items,
-		       gr_vector_void_star &output_items)
-{
-  // write_size and work_size are in bytes
-  int work_size = noutput_items*sizeof(sample_t);
-  unsigned int write_size;
-
-  while (work_size > 0) {
-    unsigned int write_space;	// bytes
-
-#ifdef NO_PTHREAD
-    while ((write_space=jack_ringbuffer_write_space (d_ringbuffer)) < 
-	   d_jack_buffer_size*sizeof(sample_t)) {
-      usleep(1000000*((d_jack_buffer_size-write_space/sizeof(sample_t))/d_sampling_rate));
-    }
-#else
-    // JACK actually requires POSIX
-
-    pthread_mutex_lock (&d_jack_process_lock);
-    while ((write_space=jack_ringbuffer_write_space (d_ringbuffer)) < 
-	   d_jack_buffer_size*sizeof(sample_t)) {
-
-      // wait until jack_sink_process() signals more room
-      pthread_cond_wait (&d_ringbuffer_ready, &d_jack_process_lock);
-    }
-    pthread_mutex_unlock (&d_jack_process_lock);
-#endif
-
-    write_space -= write_space%(d_jack_buffer_size*sizeof(sample_t));
-    write_size = std::min(write_space, (unsigned int)work_size);
-
-    if (jack_ringbuffer_write (d_ringbuffer, (char *) input_items[0],
-			       write_size) < write_size) {
-      bail ("jack_ringbuffer_write failed", 0);
-    }
-    work_size -= write_size;
-  }
-
-  return noutput_items;
-}
-
-void
-audio_jack_sink::output_error_msg (const char *msg, int err)
-{
-  fprintf (stderr, "audio_jack_sink[%s]: %s: %d\n",
-	   d_device_name.c_str (), msg,  err);
-}
-
-void
-audio_jack_sink::bail (const char *msg, int err) throw (std::runtime_error)
-{
-  output_error_msg (msg, err);
-  throw std::runtime_error ("audio_jack_sink");
-}
diff --git a/gr-audio-jack/src/audio_jack_sink.h b/gr-audio-jack/src/audio_jack_sink.h
deleted file mode 100644
index ac74cfc37..000000000
--- a/gr-audio-jack/src/audio_jack_sink.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2005,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.
- */
-#ifndef INCLUDED_AUDIO_JACK_SINK_H
-#define INCLUDED_AUDIO_JACK_SINK_H
-
-#include <gr_sync_block.h>
-#include <string>
-#include <jack/jack.h>
-#include <jack/ringbuffer.h>
-#include <stdexcept>
-
-class audio_jack_sink;
-typedef boost::shared_ptr<audio_jack_sink> audio_jack_sink_sptr;
-
-/*!
- * \brief make an JACK audio sink.
- *
- * \param sampling_rate	sampling rate in Hz
- * \param device_name JACK device name, e.g., "gr_sink"
- * \param ok_to_block
- */
-audio_jack_sink_sptr
-audio_jack_make_sink (int sampling_rate,
-		      const std::string device_name = "",
-		      bool ok_to_block = true);
-
-int jack_sink_process (jack_nframes_t nframes, void *arg);
-
-/*!
- * \brief audio sink using JACK
- *
- * The sink has one input stream of floats.
- *
- * Input samples must be in the range [-1,1].
- */
-class audio_jack_sink : public gr_sync_block {
-  friend audio_jack_sink_sptr
-  audio_jack_make_sink (int sampling_rate, const std::string device_name, bool ok_to_block);
-
-  friend int jack_sink_process (jack_nframes_t nframes, void *arg);
-
-  // typedef for pointer to class work method
-  typedef int (audio_jack_sink::*work_t)(int noutput_items,
-					 gr_vector_const_void_star &input_items,
-					 gr_vector_void_star &output_items);
-
-  unsigned int		d_sampling_rate;
-  std::string		d_device_name;
-  bool			d_ok_to_block;
-
-  jack_client_t		*d_jack_client;
-  jack_port_t		*d_jack_output_port;
-  jack_ringbuffer_t	*d_ringbuffer;
-  jack_nframes_t	d_jack_buffer_size;
-  pthread_cond_t	d_ringbuffer_ready;
-  pthread_mutex_t	d_jack_process_lock;
-
-  // random stats
-  int			d_nunderuns;		// count of underruns
-
-  void output_error_msg (const char *msg, int err);
-  void bail (const char *msg, int err) throw (std::runtime_error);
-
-
- protected:
-  audio_jack_sink (int sampling_rate, const std::string device_name, bool ok_to_block);
-
- public:
-  ~audio_jack_sink ();
-  
-  bool check_topology (int ninputs, int noutputs);
-
-  int work (int noutput_items,
-	    gr_vector_const_void_star &input_items,
-	    gr_vector_void_star &output_items);
-};
-
-#endif /* INCLUDED_AUDIO_JACK_SINK_H */
diff --git a/gr-audio-jack/src/audio_jack_source.cc b/gr-audio-jack/src/audio_jack_source.cc
deleted file mode 100644
index a92e970f5..000000000
--- a/gr-audio-jack/src/audio_jack_source.cc
+++ /dev/null
@@ -1,236 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2005,2006,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.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <audio_jack_source.h>
-#include <gr_io_signature.h>
-#include <gr_prefs.h>
-#include <stdio.h>
-#include <iostream>
-#include <stdexcept>
-#include <gri_jack.h>
-
-#ifndef NO_PTHREAD
-#include <pthread.h>
-#endif
-
-typedef jack_default_audio_sample_t sample_t;
-
-
-// Number of jack buffers in the ringbuffer
-// TODO: make it to match at least the quantity of items passed to work()
-static const unsigned int N_BUFFERS = 16;
-
-static std::string 
-default_device_name ()
-{
-  return gr_prefs::singleton()->get_string("audio_jack", "default_input_device", "gr_source");
-}
-
-
-int
-jack_source_process (jack_nframes_t nframes, void *arg)
-{
-  audio_jack_source *self = (audio_jack_source *)arg;
-  unsigned int write_size = nframes*sizeof(sample_t);
-
-  if (jack_ringbuffer_write_space (self->d_ringbuffer) < write_size) {
-    self->d_noverruns++;
-    // FIXME: move this fputs out, we shouldn't use blocking calls in process()
-    fputs ("jO", stderr);
-    return 0;
-  }
-
-  char *buffer = (char *) jack_port_get_buffer (self->d_jack_input_port, nframes);
-
-  jack_ringbuffer_write (self->d_ringbuffer, buffer, write_size);
-
-#ifndef NO_PTHREAD
-  // Tell the source thread there is data in the ringbuffer.
-  // If it is already running, the lock will not be available.
-  // We can't wait here in the process() thread, but we don't
-  // need to signal in that case, because the source thread will 
-  // check for data availability.
-
-  if (pthread_mutex_trylock (&self->d_jack_process_lock) == 0) {
-    pthread_cond_signal (&self->d_ringbuffer_ready);
-    pthread_mutex_unlock (&self->d_jack_process_lock);
-  }
-#endif
-
-  return 0;
-}
-
-// ----------------------------------------------------------------
-
-audio_jack_source_sptr
-audio_jack_make_source (int sampling_rate, const std::string dev, bool ok_to_block)
-{
-  return gnuradio::get_initial_sptr(new audio_jack_source (sampling_rate, dev, ok_to_block));
-}
-
-audio_jack_source::audio_jack_source (int sampling_rate,
-				      const std::string device_name,
-				      bool ok_to_block)
-  : gr_sync_block ("audio_jack_source",
-		   gr_make_io_signature (0, 0, 0),
-		   gr_make_io_signature (0, 0, 0)),
-    d_sampling_rate (sampling_rate),
-    d_device_name (device_name.empty() ? default_device_name() : device_name),
-    d_ok_to_block(ok_to_block),
-    d_jack_client (0),
-    d_ringbuffer (0),
-    d_noverruns (0)
-{
-#ifndef NO_PTHREAD
-    pthread_cond_init(&d_ringbuffer_ready, NULL);;
-    pthread_mutex_init(&d_jack_process_lock, NULL);
-#endif
-
-  // try to become a client of the JACK server
-  jack_options_t options = JackNullOption;
-  jack_status_t status;
-  const char *server_name = NULL;
-  if ((d_jack_client = jack_client_open (d_device_name.c_str (),
-  					 options, &status,
-					 server_name)) == NULL) {
-    fprintf (stderr, "audio_jack_source[%s]: jack server not running?\n",
-	     d_device_name.c_str());
-    throw std::runtime_error ("audio_jack_source");
-  }
-
-  // tell the JACK server to call `jack_source_process()' whenever
-  // there is work to be done.
-  jack_set_process_callback (d_jack_client, &jack_source_process, (void*)this);
-
-  // tell the JACK server to call `jack_shutdown()' if
-  // it ever shuts down, either entirely, or if it
-  // just decides to stop calling us.
-
-  //jack_on_shutdown (d_jack_client, &jack_shutdown, (void*)this);
- 
-  d_jack_input_port = jack_port_register (d_jack_client, "in", 
-					  JACK_DEFAULT_AUDIO_TYPE,
-					  JackPortIsInput, 0);
-
-
-  d_jack_buffer_size = jack_get_buffer_size (d_jack_client);
-
-  set_output_multiple (d_jack_buffer_size);
-
-  d_ringbuffer = jack_ringbuffer_create (N_BUFFERS*d_jack_buffer_size*sizeof(sample_t));
-  if (d_ringbuffer == NULL)
-    bail ("jack_ringbuffer_create failed", 0);
-
-  assert(sizeof(float)==sizeof(sample_t));
-  set_output_signature (gr_make_io_signature (1, 1, sizeof (sample_t)));
-
-
-  jack_nframes_t sample_rate = jack_get_sample_rate (d_jack_client);
-
-  if ((jack_nframes_t)sampling_rate != sample_rate){
-    fprintf (stderr, "audio_jack_source[%s]: unable to support sampling rate %d\n",
-	     d_device_name.c_str (), sampling_rate);
-    fprintf (stderr, "  card requested %d instead.\n", sample_rate);
-  }
-}
-
-
-bool
-audio_jack_source::check_topology (int ninputs, int noutputs)
-{
-  // tell the JACK server that we are ready to roll 
-  if (jack_activate (d_jack_client))
-    throw std::runtime_error ("audio_jack_source");
-
-  return true;
-}
-
-audio_jack_source::~audio_jack_source ()
-{
-  jack_client_close (d_jack_client);
-  jack_ringbuffer_free (d_ringbuffer);
-}
-
-int
-audio_jack_source::work (int noutput_items,
-			 gr_vector_const_void_star &input_items,
-			 gr_vector_void_star &output_items)
-{
-  // read_size and work_size are in bytes
-  unsigned int read_size;
-
-  // Minimize latency
-  noutput_items = std::min (noutput_items, (int)d_jack_buffer_size);
-
-  int work_size = noutput_items*sizeof(sample_t);
-
-  while (work_size > 0) {
-    unsigned int read_space;	// bytes
-
-#ifdef NO_PTHREAD
-    while ((read_space=jack_ringbuffer_read_space (d_ringbuffer)) < 
-	   d_jack_buffer_size*sizeof(sample_t)) {
-      usleep(1000000*((d_jack_buffer_size-read_space/sizeof(sample_t))/d_sampling_rate));
-    }
-#else
-    // JACK actually requires POSIX
-
-    pthread_mutex_lock (&d_jack_process_lock);
-    while ((read_space=jack_ringbuffer_read_space (d_ringbuffer)) < 
-		    d_jack_buffer_size*sizeof(sample_t)) {
-
-      // wait until jack_source_process() signals more data
-      pthread_cond_wait (&d_ringbuffer_ready, &d_jack_process_lock);
-    }
-    pthread_mutex_unlock (&d_jack_process_lock);
-#endif
-
-    read_space -= read_space%(d_jack_buffer_size*sizeof(sample_t));
-    read_size = std::min(read_space, (unsigned int)work_size);
-
-    if (jack_ringbuffer_read (d_ringbuffer, (char *) output_items[0],
-			      read_size) < read_size) {
-      bail ("jack_ringbuffer_read failed", 0);
-    }
-    work_size -= read_size;
-  }
-
-  return noutput_items;
-}
-
-void
-audio_jack_source::output_error_msg (const char *msg, int err)
-{
-  fprintf (stderr, "audio_jack_source[%s]: %s: %d\n",
-	   d_device_name.c_str (), msg,  err);
-}
-
-void
-audio_jack_source::bail (const char *msg, int err) throw (std::runtime_error)
-{
-  output_error_msg (msg, err);
-  throw std::runtime_error ("audio_jack_source");
-}
diff --git a/gr-audio-jack/src/audio_jack_source.h b/gr-audio-jack/src/audio_jack_source.h
deleted file mode 100644
index 8831a7363..000000000
--- a/gr-audio-jack/src/audio_jack_source.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2005,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.
- */
-#ifndef INCLUDED_AUDIO_JACK_SOURCE_H
-#define INCLUDED_AUDIO_JACK_SOURCE_H
-
-#include <gr_sync_block.h>
-#include <string>
-#include <jack/jack.h>
-#include <jack/ringbuffer.h>
-#include <stdexcept>
-
-class audio_jack_source;
-typedef boost::shared_ptr<audio_jack_source> audio_jack_source_sptr;
-
-/*!
- * \brief make a JACK audio source.
- *
- * \param sampling_rate	sampling rate in Hz
- * \param device_name JACK device name, e.g., "gr_source"
- * \param ok_to_block
- */
-audio_jack_source_sptr
-audio_jack_make_source (int sampling_rate,
-			const std::string device_name = "",
-			bool ok_to_block = true);
-
-int jack_source_process (jack_nframes_t nframes, void *arg);
-
-/*!
- * \brief audio source using JACK
- *
- * The source has one input stream of floats.
- *
- * Output samples will be in the range [-1,1].
- */
-class audio_jack_source : public gr_sync_block {
-  friend audio_jack_source_sptr
-  audio_jack_make_source (int sampling_rate, const std::string device_name, bool ok_to_block);
-
-  friend int jack_source_process (jack_nframes_t nframes, void *arg);
-
-  // typedef for pointer to class work method
-  typedef int (audio_jack_source::*work_t)(int noutput_items,
-					   gr_vector_const_void_star &input_items,
-					   gr_vector_void_star &output_items);
-
-  unsigned int		d_sampling_rate;
-  std::string		d_device_name;
-  bool			d_ok_to_block;
-
-  jack_client_t		*d_jack_client;
-  jack_port_t		*d_jack_input_port;
-  jack_ringbuffer_t	*d_ringbuffer;
-  jack_nframes_t	d_jack_buffer_size;
-  pthread_cond_t	d_ringbuffer_ready;
-  pthread_mutex_t	d_jack_process_lock;
-
-  // random stats
-  int			d_noverruns;		// count of overruns
-
-  void output_error_msg (const char *msg, int err);
-  void bail (const char *msg, int err) throw (std::runtime_error);
-
-
- protected:
-  audio_jack_source (int sampling_rate, const std::string device_name, bool ok_to_block);
-
- public:
-  ~audio_jack_source ();
-  
-  bool check_topology (int ninputs, int noutputs);
-
-  int work (int noutput_items,
-	    gr_vector_const_void_star &input_items,
-	    gr_vector_void_star &output_items);
-};
-
-#endif /* INCLUDED_AUDIO_JACK_SOURCE_H */
diff --git a/gr-audio-jack/src/gri_jack.cc b/gr-audio-jack/src/gri_jack.cc
deleted file mode 100644
index fef1c58a6..000000000
--- a/gr-audio-jack/src/gri_jack.cc
+++ /dev/null
@@ -1,30 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2005 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.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <gri_jack.h>
-#include <algorithm>
-
-
diff --git a/gr-audio-jack/src/gri_jack.h b/gr-audio-jack/src/gri_jack.h
deleted file mode 100644
index ddc0b744d..000000000
--- a/gr-audio-jack/src/gri_jack.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2005 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.
- */
-
-#ifndef INCLUDED_GRI_JACK_H
-#define INCLUDED_GRI_JACK_H
-
-#include <stdio.h>
-
-#endif /* INCLUDED_GRI_JACK_H */
diff --git a/gr-audio-jack/src/qa_jack.py b/gr-audio-jack/src/qa_jack.py
deleted file mode 100755
index ad6bee27b..000000000
--- a/gr-audio-jack/src/qa_jack.py
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2005,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.
-# 
-
-from gnuradio import gr, gr_unittest
-import audio_jack
-
-class test_audio_jack (gr_unittest.TestCase):
-
-    def setUp (self):
-        self.tb = gr.top_block ()
-
-    def tearDown (self):
-        self.tb = None
-
-    def test_000_nop (self):
-        """Just see if we can import the module...
-        They may not have JACK library, etc.  Don't try to run anything"""
-        pass
-    
-if __name__ == '__main__':
-    gr_unittest.run(test_audio_jack, "test_audio_jack.xml")
diff --git a/gr-audio-jack/src/run_tests.in b/gr-audio-jack/src/run_tests.in
deleted file mode 100644
index 77af85641..000000000
--- a/gr-audio-jack/src/run_tests.in
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-# 1st parameter is absolute path to component source directory
-# 2nd parameter is absolute path to component build directory
-# 3rd parameter is path to Python QA directory
-
-@top_builddir@/run_tests.sh \
-    @abs_top_srcdir@/gr-audio-jack \
-    @abs_top_builddir@/gr-audio-jack \
-    @srcdir@