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

10 files changed, 0 insertions, 1058 deletions

diff --git a/gr-audio-windows/src/.gitignore b/gr-audio-windows/src/.gitignore
deleted file mode 100644
index 7f6631569..000000000
--- a/gr-audio-windows/src/.gitignore
+++ /dev/null
@@ -1,38 +0,0 @@
-/*.cache
-/*.la
-/*.lo
-/*.pc
-/.deps
-/.la
-/.libs
-/.lo
-/Makefile
-/Makefile.in
-/aclocal.m4
-/autom4te.cache
-/config.cache
-/config.h
-/config.h.in
-/config.log
-/config.status
-/configure
-/depcomp
-/install-sh
-/libtool
-/ltmain.sh
-/make.log
-/missing
-/missing
-/mkinstalldirs
-/py-compile
-/stamp-h
-/stamp-h.in
-/stamp-h1
-/stamp-h1.in
-/stamp-h2.in
-/run_tests
-/audio_windows.cc
-/audio_windows.py
-/gnuradio
-/guile
-/python
diff --git a/gr-audio-windows/src/Makefile.am b/gr-audio-windows/src/Makefile.am
deleted file mode 100644
index 1d7b253ec..000000000
--- a/gr-audio-windows/src/Makefile.am
+++ /dev/null
@@ -1,72 +0,0 @@
-#
-# Copyright 2004,2005,2008,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 $(top_srcdir)/Makefile.common
-include $(top_srcdir)/Makefile.swig
-
-TESTS =
-DISTCLEANFILES += run_tests
-EXTRA_DIST += run_tests.in
-
-AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
-
-noinst_PYTHON = qa_audio_windows.py
-
-# C/C++ headers get installed in ${prefix}/include/gnuradio
-grinclude_HEADERS =			\
-	audio_windows_sink.h		\
-	audio_windows_source.h
-
-lib_LTLIBRARIES = libgnuradio-audio-windows.la
-
-libgnuradio_audio_windows_la_SOURCES = 	\
-	audio_windows_sink.cc		\
-	audio_windows_source.cc
-
-libgnuradio_audio_windows_la_LIBADD =	\
-	$(GNURADIO_CORE_LA)		\
-	$(WINAUDIO_LIBS)
-
-libgnuradio_audio_windows_la_LDFLAGS =	\
-	$(LIBGNURADIO_CORE_EXTRA_LDFLAGS) \
-	$(NO_UNDEFINED) \
-	$(LTVERSIONFLAGS)
-
-###################################
-# SWIG interface and library
-
-TOP_SWIG_IFILES = 			\
-	audio_windows.i
-
-# Install so that they end up available as:
-#   import gnuradio.audio_windows
-# This ends up at:
-#   ${prefix}/lib/python${python_version}/site-packages/gnuradio
-audio_windows_pythondir_category =	\
-	gnuradio
-
-# additional libraries for linking with the SWIG-generated library
-audio_windows_la_swig_libadd =		\
-	libgnuradio-audio-windows.la
-
-if PYTHON
-TESTS += run_tests
-endif
diff --git a/gr-audio-windows/src/Makefile.swig.gen b/gr-audio-windows/src/Makefile.swig.gen
deleted file mode 100644
index cc21f30bc..000000000
--- a/gr-audio-windows/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_windows.i
-
-## Default install locations for these files:
-##
-## Default location for the Python directory is:
-##  ${prefix}/lib/python${python_version}/site-packages/[category]/audio_windows
-## Default location for the Python exec directory is:
-##  ${exec_prefix}/lib/python${python_version}/site-packages/[category]/audio_windows
-##
-## 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_windows_pythondir_category ?= gnuradio/audio_windows
-audio_windows_pylibdir_category ?= $(audio_windows_pythondir_category)
-audio_windows_pythondir = $(pythondir)/$(audio_windows_pythondir_category)
-audio_windows_pylibdir = $(pyexecdir)/$(audio_windows_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_windows_scmlibdir = $(libdir)
-
-# The scm files for the guile modules get installed where ever guile
-# is installed, usually /usr/share/guile/site/audio_windows
-# FIXME: determince whether these should be installed with gnuradio.
-audio_windows_scmdir = $(guiledir)
-
-## SWIG headers are always installed into the same directory.
-
-audio_windows_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_windows_swiginclude_HEADERS =		\
-	audio_windows.i			\
-	$(audio_windows_swiginclude_headers)
-
-if PYTHON
-audio_windows_pylib_LTLIBRARIES =		\
-	_audio_windows.la
-
-_audio_windows_la_SOURCES = 			\
-	python/audio_windows.cc		\
-	$(audio_windows_la_swig_sources)
-
-audio_windows_python_PYTHON =			\
-	audio_windows.py			\
-	$(audio_windows_python)
-
-_audio_windows_la_LIBADD =			\
-	$(STD_SWIG_LA_LIB_ADD)		\
-	$(audio_windows_la_swig_libadd)
-
-_audio_windows_la_LDFLAGS =			\
-	$(STD_SWIG_LA_LD_FLAGS)		\
-	$(audio_windows_la_swig_ldflags)
-
-_audio_windows_la_CXXFLAGS =			\
-	$(STD_SWIG_CXX_FLAGS)		\
-	-I$(top_builddir) 		\
-	$(audio_windows_la_swig_cxxflags)
-
-python/audio_windows.cc: audio_windows.py
-audio_windows.py: audio_windows.i
-
-# Include the python dependencies for this file
--include python/audio_windows.d
-
-endif		# end of if python
-
-if GUILE
-
-audio_windows_scmlib_LTLIBRARIES = 		\
-	libguile-gnuradio-audio_windows.la
-libguile_gnuradio_audio_windows_la_SOURCES =	\
-	guile/audio_windows.cc			\
-	$(audio_windows_la_swig_sources)
-nobase_audio_windows_scm_DATA = 		\
-	gnuradio/audio_windows.scm 		\
-	gnuradio/audio_windows-primitive.scm
-libguile_gnuradio_audio_windows_la_LIBADD = 	\
-	$(STD_SWIG_LA_LIB_ADD)		\
-	$(audio_windows_la_swig_libadd)
-libguile_gnuradio_audio_windows_la_LDFLAGS = 	\
-	$(STD_SWIG_LA_LD_FLAGS)		\
-	$(audio_windows_la_swig_ldflags)
-libguile_gnuradio_audio_windows_la_CXXFLAGS = 	\
-	$(STD_SWIG_CXX_FLAGS)		\
-	-I$(top_builddir) 		\
-	$(audio_windows_la_swig_cxxflags)
-
-guile/audio_windows.cc: gnuradio/audio_windows.scm
-gnuradio/audio_windows.scm: audio_windows.i
-gnuradio/audio_windows-primitive.scm: gnuradio/audio_windows.scm
-
-# Include the guile dependencies for this file
--include guile/audio_windows.d
-
-endif				# end of GUILE
-
-
diff --git a/gr-audio-windows/src/audio_windows.i b/gr-audio-windows/src/audio_windows.i
deleted file mode 100644
index c154eacd6..000000000
--- a/gr-audio-windows/src/audio_windows.i
+++ /dev/null
@@ -1,73 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004,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_windows_sink.h"
-#include "audio_windows_source.h"
-%}
-
-// ----------------------------------------------------------------
-
-GR_SWIG_BLOCK_MAGIC(audio_windows,sink)
-
-audio_windows_sink_sptr
-audio_windows_make_sink (int sampling_freq,
-		     const std::string dev = ""
-		     ) throw (std::runtime_error);
-
-
-class audio_windows_sink : public gr_sync_block {
- protected:
-  audio_windows_sink (int sampling_freq, const std::string device_name = "");
-
- public:
-  ~audio_windows_sink ();
-};
-
-// ----------------------------------------------------------------
-
-GR_SWIG_BLOCK_MAGIC(audio_windows,source)
-
-audio_windows_source_sptr
-audio_windows_make_source (int sampling_freq,
-		       const std::string dev = ""
-		       ) throw (std::runtime_error);
-
-class audio_windows_source : public gr_sync_block {
- protected:
-  audio_windows_source (int sampling_freq, const std::string device_name = "");
-
- public:
-  ~audio_windows_source ();
-};
-
-#if SWIGGUILE
-%scheme %{
-(load-extension-global "libguile-gnuradio-audio_windows" "scm_init_gnuradio_audio_windows_module")
-%}
-
-%goops %{
-(use-modules (gnuradio gnuradio_core_runtime))
-%}
-#endif
diff --git a/gr-audio-windows/src/audio_windows_sink.cc b/gr-audio-windows/src/audio_windows_sink.cc
deleted file mode 100644
index a47871954..000000000
--- a/gr-audio-windows/src/audio_windows_sink.cc
+++ /dev/null
@@ -1,323 +0,0 @@
-/* -*- c++ -*- */
-/*
-* Copyright 2004,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_windows_sink.h>
-#include <gr_io_signature.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <iostream>
-#include <stdexcept>
-#include <string>
-#include <sstream>
-
-static const double CHUNK_TIME = 0.1;	//0.001;           // 100 ms
-
-// FIXME these should query some kind of user preference
-
-static std::string
-default_device_name ()
-{
-  return "WAVE_MAPPER";
-}
-
-audio_windows_sink::audio_windows_sink (int sampling_freq, const std::string device_name)
-  : gr_sync_block ("audio_windows_sink",
-		   gr_make_io_signature (1, 2, sizeof (float)),
-		   gr_make_io_signature (0, 0, 0)),
-    d_sampling_freq (sampling_freq),
-    d_device_name (device_name.empty ()? default_device_name () : device_name),
-    d_fd (-1), d_buffer (0), d_chunk_size (0)
-{
-  d_wave_write_event = CreateEvent (NULL, FALSE, FALSE, NULL);
-  if (open_waveout_device () < 0)
-    {
-      //fprintf (stderr, "audio_windows_sink:open_waveout_device() failed\n");
-      perror ("audio_windows_sink:open_waveout_device( ) failed\n");
-      throw
-      std::runtime_error ("audio_windows_sink:open_waveout_device() failed");
-    }
-
-  d_chunk_size = (int) (d_sampling_freq * CHUNK_TIME);
-  set_output_multiple (d_chunk_size);
-
-  d_buffer = new short[d_chunk_size * 2];
-
-}
-
-audio_windows_sink::~audio_windows_sink ()
-{
-  /* Free the callback Event */
-  CloseHandle (d_wave_write_event);
-  waveOutClose (d_h_waveout);
-  delete[]d_buffer;
-}
-
-audio_windows_sink_sptr
-audio_windows_make_sink (int sampling_freq, const std::string dev)
-{
-  return gnuradio::get_initial_sptr (new audio_windows_sink (sampling_freq, dev));
-}
-
-
-int
-audio_windows_sink::work (int noutput_items,
-			  gr_vector_const_void_star & input_items,
-			  gr_vector_void_star & output_items)
-{
-  const float *f0, *f1;
-  bool playtestsound = false;
-  if (playtestsound)
-    {
-      // dummy
-
-      f0 = (const float *) input_items[0];
-
-      for (int i = 0; i < noutput_items; i += d_chunk_size)
-	{
-	  for (int j = 0; j < d_chunk_size; j++)
-	    {
-	      d_buffer[2 * j + 0] = (short) (sin (2.0 * 3.1415926535897932384626 * (float) j * 1000.0 / (float) d_sampling_freq) * 8192 + 0);	//+32767
-	      d_buffer[2 * j + 1] = d_buffer[2 * j + 0];
-	    }
-	  f0 += d_chunk_size;
-	  if (write_waveout
-	      ((HPSTR) d_buffer, 2 * d_chunk_size * sizeof (short)) < 0)
-	    {
-	      fprintf (stderr, "audio_windows_sink: write failed\n");
-	      perror ("audio_windows_sink: write failed");
-	    }
-	}
-      // break;
-    }
-  else
-    {
-      switch (input_items.size ())
-	{
-
-	case 1:		// mono input
-
-	  f0 = (const float *) input_items[0];
-
-	  for (int i = 0; i < noutput_items; i += d_chunk_size)
-	    {
-	      for (int j = 0; j < d_chunk_size; j++)
-		{
-		  d_buffer[2 * j + 0] = (short) (f0[j] * 32767);
-		  d_buffer[2 * j + 1] = (short) (f0[j] * 32767);
-		}
-	      f0 += d_chunk_size;
-	      if (write_waveout
-		  ((HPSTR) d_buffer, 2 * d_chunk_size * sizeof (short)) < 0)
-		{
-		  //fprintf (stderr, "audio_windows_sink: write failed\n");
-		  perror ("audio_windows_sink: write failed");
-		}
-	    }
-	  break;
-
-	case 2:		// stereo input
-
-	  f0 = (const float *) input_items[0];
-	  f1 = (const float *) input_items[1];
-
-	  for (int i = 0; i < noutput_items; i += d_chunk_size)
-	    {
-	      for (int j = 0; j < d_chunk_size; j++)
-		{
-		  d_buffer[2 * j + 0] = (short) (f0[j] * 32767);
-		  d_buffer[2 * j + 1] = (short) (f1[j] * 32767);
-		}
-	      f0 += d_chunk_size;
-	      f1 += d_chunk_size;
-	      if (write_waveout
-		  ((HPSTR) d_buffer, 2 * d_chunk_size * sizeof (short)) < 0)
-		{
-		  //fprintf (stderr, "audio_windows_sink: write failed\n");
-		  perror ("audio_windows_sink: write failed");
-		}
-	    }
-	  break;
-	}
-    }
-  return noutput_items;
-}
-
-int
-audio_windows_sink::string_to_int (const std::string & s)
-{
-  int i;
-  std::istringstream (s) >> i;
-  return i;
-}				//ToInt()
-
-int
-audio_windows_sink::open_waveout_device (void)
-{
-
-  UINT /*UINT_PTR */ u_device_id;
-	/** Identifier of the waveform-audio output device to open. It can be either a device identifier or a handle of an open waveform-audio input device. You can use the following flag instead of a device identifier.
-	*
-	* Value Meaning
-	* WAVE_MAPPER The function selects a waveform-audio output device capable of playing the given format.
-	*/
-  if (d_device_name.empty () || default_device_name () == d_device_name)
-    u_device_id = WAVE_MAPPER;
-  else
-    u_device_id = (UINT) string_to_int (d_device_name);
-  // Open a waveform device for output using event callback.
-
-  unsigned long result;
-  //HWAVEOUT      outHandle;
-  WAVEFORMATEX wave_format;
-
-  /* Initialize the WAVEFORMATEX for 16-bit, 44KHz, stereo */
-  wave_format.wFormatTag = WAVE_FORMAT_PCM;
-  wave_format.nChannels = 2;
-  wave_format.nSamplesPerSec = d_sampling_freq;	//44100;
-  wave_format.wBitsPerSample = 16;
-  wave_format.nBlockAlign =
-    wave_format.nChannels * (wave_format.wBitsPerSample / 8);
-  wave_format.nAvgBytesPerSec =
-    wave_format.nSamplesPerSec * wave_format.nBlockAlign;
-  wave_format.cbSize = 0;
-
-  /* Open the (preferred) Digital Audio Out device. */
-  result = waveOutOpen (&d_h_waveout, WAVE_MAPPER, &wave_format, (DWORD_PTR) d_wave_write_event, 0, CALLBACK_EVENT | WAVE_ALLOWSYNC);	//|WAVE_FORMAT_DIRECT | CALLBACK_EVENT| WAVE_ALLOWSYNC
-  if (result)
-    {
-      fprintf (stderr,
-	       "audio_windows_sink: Failed to open waveform output device.\n");
-      perror ("audio_windows_sink: Failed to open waveform output device.");
-      //LocalUnlock(hFormat);
-      //LocalFree(hFormat);
-      //mmioClose(hmmio, 0);
-      return -1;
-    }
-
-  //
-  // Do not Swallow the "open" event.
-  //
-  //WaitForSingleObject(d_wave_write_event, INFINITE);
-
-  // Allocate and lock memory for the header.
-
-  d_h_wave_hdr = GlobalAlloc (GMEM_MOVEABLE | GMEM_SHARE,
-			      (DWORD) sizeof (WAVEHDR));
-  if (d_h_wave_hdr == NULL)
-    {
-      //GlobalUnlock(hData);
-      //GlobalFree(hData);
-      //fprintf (stderr, "audio_windows_sink: Not enough memory for header.\n");
-      perror ("audio_windows_sink: Not enough memory for header.");
-      return -1;
-    }
-
-  d_lp_wave_hdr = (LPWAVEHDR) GlobalLock (d_h_wave_hdr);
-  if (d_lp_wave_hdr == NULL)
-    {
-      //GlobalUnlock(hData);
-      //GlobalFree(hData);
-      //fprintf (stderr, "audio_windows_sink: Failed to lock memory for header.\n");
-      perror ("audio_windows_sink: Failed to lock memory for header.");
-      return -1;
-    }
-  //d_lp_wave_hdr->dwFlags = WHDR_DONE;
-  return 0;
-}
-
-int
-audio_windows_sink::write_waveout (HPSTR lp_data, DWORD dw_data_size)
-{
-  UINT w_result;
-  int teller = 100;
-  // After allocation, set up and prepare header.
-  /*while ((d_lp_wave_hdr->dwFlags & WHDR_DONE)==0 && teller>0)
-     {
-     teller--;
-     Sleep(1);
-     } */
-  // Wait until previous wave write completes (first event is the open event).
-  WaitForSingleObject (d_wave_write_event, 100);	//INFINITE
-  d_lp_wave_hdr->lpData = lp_data;
-  d_lp_wave_hdr->dwBufferLength = dw_data_size;
-  d_lp_wave_hdr->dwFlags = 0L;
-  /* Clear the WHDR_DONE bit (which the driver set last time that
-     this WAVEHDR was sent via waveOutWrite and was played). Some
-     drivers need this to be cleared */
-  //d_lp_wave_hdr->dwFlags &= ~WHDR_DONE;
-
-  d_lp_wave_hdr->dwLoops = 0L;
-  w_result =
-    waveOutPrepareHeader (d_h_waveout, d_lp_wave_hdr, sizeof (WAVEHDR));
-  if (w_result != 0)
-    {
-      //GlobalUnlock( hData);
-      //GlobalFree(hData);
-      //fprintf (stderr, "audio_windows_sink: Failed to waveOutPrepareHeader. error %i\n",w_result);
-      perror ("audio_windows_sink: Failed to waveOutPrepareHeader");
-    }
-  // Now the data block can be sent to the output device. The
-  // waveOutWrite function returns immediately and waveform
-  // data is sent to the output device in the background.
-  //while (!  readyforplayback) Sleep(1);
-  //readyforplayback=false;
-  //
-  //
-
-  w_result = waveOutWrite (d_h_waveout, d_lp_wave_hdr, sizeof (WAVEHDR));
-  if (w_result != 0)
-    {
-      //GlobalUnlock( hData);
-      //GlobalFree(hData);
-      //fprintf (stderr, "audio_windows_sink: Failed to write block to device.error %i\n",w_result);
-      perror ("audio_windows_sink: Failed to write block to device");
-      switch (w_result)
-	{
-	case MMSYSERR_INVALHANDLE:
-	  fprintf (stderr, "Specified device handle is invalid. \n");
-	  break;
-	case MMSYSERR_NODRIVER:
-	  fprintf (stderr, " No device driver is present.  \n");
-	  break;
-	case MMSYSERR_NOMEM:
-	  fprintf (stderr, " Unable to allocate or lock memory.  \n");
-	  break;
-	case WAVERR_UNPREPARED:
-	  fprintf (stderr,
-		   " The data block pointed to by the pwh parameter hasn't been prepared.  \n");
-	  break;
-	default:
-	  fprintf (stderr, "Unknown error %i\n", w_result);
-	}
-      waveOutUnprepareHeader (d_h_waveout, d_lp_wave_hdr, sizeof (WAVEHDR));
-      return -1;
-    }
-  //   WaitForSingleObject(d_wave_write_event, INFINITE);
-  return 0;
-}
diff --git a/gr-audio-windows/src/audio_windows_sink.h b/gr-audio-windows/src/audio_windows_sink.h
deleted file mode 100644
index 2212ecf06..000000000
--- a/gr-audio-windows/src/audio_windows_sink.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004 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_WINDOWS_SINK_H
-#define INCLUDED_AUDIO_WINDOWS_SINK_H
-
-#define WIN32_LEAN_AND_MEAN
-#define NOMINMAX		// stops windef.h defining max/min under cygwin
-
-#include <windows.h>
-#include <mmsystem.h>
-
-#include <gr_sync_block.h>
-#include <string>
-
-
-class audio_windows_sink;
-typedef boost::shared_ptr <audio_windows_sink> audio_windows_sink_sptr;
-
-audio_windows_sink_sptr
-audio_windows_make_sink (int sampling_freq, const std::string dev = "");
-
-/*!
- * \brief audio sink using winmm mmsystem (win32 only)
- *
- * input signature is one or two streams of floats.
- * Input samples must be in the range [-1,1].
- */
-
-class audio_windows_sink : public gr_sync_block
-{
-  friend
-    audio_windows_sink_sptr
-  audio_windows_make_sink (int sampling_freq, const std::string device_name);
-
-  int    	d_sampling_freq;
-  std::string   d_device_name;
-  int		d_fd;
-  short        *d_buffer;
-  int           d_chunk_size;
-  HWAVEOUT      d_h_waveout;
-  HGLOBAL       d_h_wave_hdr;
-  LPWAVEHDR     d_lp_wave_hdr;
-  HANDLE        d_wave_write_event;
-
-protected:
-  int
-  string_to_int (const std::string & s);
-  audio_windows_sink (int sampling_freq, const std::string device_name = "");
-  int
-  open_waveout_device (void);
-  int
-  write_waveout (HPSTR lp_data, DWORD dw_data_size);
-
-public:
-  ~audio_windows_sink ();
-
-  int
-  work (int noutput_items,
-	gr_vector_const_void_star & input_items,
-	gr_vector_void_star & output_items);
-};
-
-#endif /* INCLUDED_AUDIO_WINDOWS_SINK_H */
diff --git a/gr-audio-windows/src/audio_windows_source.cc b/gr-audio-windows/src/audio_windows_source.cc
deleted file mode 100644
index a88923afd..000000000
--- a/gr-audio-windows/src/audio_windows_source.cc
+++ /dev/null
@@ -1,206 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004,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_windows_source.h>
-#include <gr_io_signature.h>
-//include <sys/soundcard.h>
-//include <sys/ioctl.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <iostream>
-#include <stdexcept>
-
-
-static const double CHUNK_TIME = 0.005;	// 5 ms
-
-// FIXME these should query some kind of user preference
-
-static std::string
-default_device_name ()
-{
-  return "/dev/dsp";
-}
-
-audio_windows_source::audio_windows_source (int sampling_freq, const std::string device_name)
-  : gr_sync_block ("audio_windows_source",
-		   gr_make_io_signature (0, 0, 0),
-		   gr_make_io_signature (1, 2, sizeof (float))),
-    d_sampling_freq (sampling_freq),
-    d_device_name (device_name.empty ()? default_device_name () : device_name),
-    d_fd (-1), d_buffer (0), d_chunk_size (0)
-{
-  //FIXME TODO implement me
-#if 0
-  if ((d_fd = open (d_device_name.c_str (), O_RDONLY)) < 0)
-    {
-      fprintf (stderr, "audio_windows_source: ");
-      perror (d_device_name.c_str ());
-      throw
-      std::runtime_error ("audio_windows_source");
-    }
-
-  d_chunk_size = (int) (d_sampling_freq * CHUNK_TIME);
-  set_output_multiple (d_chunk_size);
-
-  d_buffer = new short[d_chunk_size * 2];
-
-  int  format = AFMT_S16_NE;
-  int  orig_format = format;
-  if (ioctl (d_fd, SNDCTL_DSP_SETFMT, &format) < 0)
-    {
-      std::
-	cerr << "audio_windows_source: " << d_device_name <<
-	" ioctl failed\n";
-      perror (d_device_name.c_str ());
-      throw
-      std::runtime_error ("audio_windows_source");
-    }
-
-  if (format != orig_format)
-    {
-      fprintf (stderr, "audio_windows_source: unable to support format %d\n",
-	       orig_format);
-      fprintf (stderr, "  card requested %d instead.\n", format);
-    }
-
-  // set to stereo no matter what.  Some hardware only does stereo
-  int channels = 2;
-  if (ioctl (d_fd, SNDCTL_DSP_CHANNELS, &channels) < 0 || channels != 2)
-    {
-      perror ("audio_windows_source: could not set STEREO mode");
-      throw
-      std::runtime_error ("audio_windows_source");
-    }
-
-  // set sampling freq
-  int sf = sampling_freq;
-  if (ioctl (d_fd, SNDCTL_DSP_SPEED, &sf) < 0)
-    {
-      std::cerr << "audio_windows_source: "
-	<< d_device_name << ": invalid sampling_freq "
-	<< sampling_freq << "\n";
-      sampling_freq = 8000;
-      if (ioctl (d_fd, SNDCTL_DSP_SPEED, &sf) < 0)
-	{
-	  std::
-	    cerr <<
-	    "audio_windows_source: failed to set sampling_freq to 8000\n";
-	  throw
-	  std::runtime_error ("audio_windows_source");
-	}
-    }
-#endif
-}
-
-audio_windows_source::~audio_windows_source ()
-{
-  /*close (d_fd);
-     delete [] d_buffer;
-   */
-}
-
-audio_windows_source_sptr
-audio_windows_make_source (int sampling_freq, const std::string dev)
-{
-  return gnuradio::get_initial_sptr (new audio_windows_source (sampling_freq, dev));
-}
-
-
-int
-audio_windows_source::work (int noutput_items,
-			    gr_vector_const_void_star & input_items,
-			    gr_vector_void_star & output_items)
-{
-  //FIXME TODO implement me
-#if 0
-  float *f0 = (float *) output_items[0];
-  float *f1 = (float *) output_items[1];	// will be invalid if this is mono output
-
-  const int shorts_per_item = 2;	// L + R
-  const int bytes_per_item = shorts_per_item * sizeof (short);
-
-  // To minimize latency, never return more than CHUNK_TIME
-  // worth of samples per call to work.
-  // FIXME, we need an API to set this value
-
-  noutput_items = std::min (noutput_items, d_chunk_size);
-
-  int base = 0;
-  int ntogo = noutput_items;
-
-  while (ntogo > 0)
-    {
-      int nbytes = std::min (ntogo, d_chunk_size) * bytes_per_item;
-      int result_nbytes = read (d_fd, d_buffer, nbytes);
-
-      if (result_nbytes < 0)
-	{
-	  perror ("audio_windows_source");
-	  return -1;		// say we're done
-	}
-
-      if ((result_nbytes & (bytes_per_item - 1)) != 0)
-	{
-	  fprintf (stderr, "audio_windows_source: internal error.\n");
-	  throw std::runtime_error ("internal error");
-	}
-
-      int result_nitems = result_nbytes / bytes_per_item;
-
-      // now unpack samples into output streams
-
-      switch (output_items.size ())
-	{
-	case 1:		// mono output
-	  for (int i = 0; i < result_nitems; i++)
-	    {
-	      f0[base + i] = d_buffer[2 * i + 0] * (1.0 / 32767);
-	    }
-	  break;
-
-	case 2:		// stereo output
-	  for (int i = 0; i < result_nitems; i++)
-	    {
-	      f0[base + i] = d_buffer[2 * i + 0] * (1.0 / 32767);
-	      f1[base + i] = d_buffer[2 * i + 1] * (1.0 / 32767);
-	    }
-	  break;
-
-	default:
-	  assert (0);
-	}
-
-      ntogo -= result_nitems;
-      base += result_nitems;
-    }
-
-  return noutput_items - ntogo;
-#endif
-  return -1;			// EOF
-}
diff --git a/gr-audio-windows/src/audio_windows_source.h b/gr-audio-windows/src/audio_windows_source.h
deleted file mode 100644
index caeda36b8..000000000
--- a/gr-audio-windows/src/audio_windows_source.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004 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_WINDOWS_SOURCE_H
-#define INCLUDED_AUDIO_WINDOWS_SOURCE_H
-
-#include <gr_sync_block.h>
-#include <string>
-
-
-class audio_windows_source;
-typedef boost::shared_ptr <audio_windows_source> audio_windows_source_sptr;
-
-audio_windows_source_sptr
-audio_windows_make_source (int sampling_freq, const std::string dev = "");
-
-/*!
- * \brief audio source using winmm mmsystem (win32 only)
- *
- * Output signature is one or two streams of floats.
- * Output samples will be in the range [-1,1].
- */
-
-class audio_windows_source : public gr_sync_block
-{
-  friend
-    audio_windows_source_sptr
-  audio_windows_make_source (int sampling_freq,
-			     const std::string device_name);
-
-  int    	d_sampling_freq;
-  std::string   d_device_name;
-  int		d_fd;
-  short        *d_buffer;
-  int		d_chunk_size;
-
-protected:
-  audio_windows_source (int sampling_freq, const std::string device_name = "");
-
-public:
-  ~audio_windows_source ();
-
-  int
-  work (int noutput_items,
-	gr_vector_const_void_star & input_items,
-	gr_vector_void_star & output_items);
-};
-
-#endif /* INCLUDED_AUDIO_WINDOWS_SOURCE_H */
diff --git a/gr-audio-windows/src/qa_audio_windows.py b/gr-audio-windows/src/qa_audio_windows.py
deleted file mode 100755
index 0d14535a6..000000000
--- a/gr-audio-windows/src/qa_audio_windows.py
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2005,2007 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_windows
-
-class qa_oss (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 audio drivers, soundcard, etc.  Don't try to run anything"""
-        pass
-    
-if __name__ == '__main__':
-    gr_unittest.main ()
diff --git a/gr-audio-windows/src/run_tests.in b/gr-audio-windows/src/run_tests.in
deleted file mode 100755
index f7de663ba..000000000
--- a/gr-audio-windows/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-windows \
-    @abs_top_builddir@/gr-audio-windows \
-    @srcdir@