summaryrefslogtreecommitdiff
path: root/gr-audio-oss
diff options
context:
space:
mode:
Diffstat (limited to 'gr-audio-oss')
-rw-r--r--gr-audio-oss/.gitignore30
-rw-r--r--gr-audio-oss/Makefile.am30
-rw-r--r--gr-audio-oss/gnuradio-audio-oss.pc.in11
-rw-r--r--gr-audio-oss/gr-audio-oss.conf9
-rw-r--r--gr-audio-oss/src/.gitignore14
-rw-r--r--gr-audio-oss/src/Makefile.am74
-rw-r--r--gr-audio-oss/src/Makefile.swig.gen259
-rw-r--r--gr-audio-oss/src/audio_oss.i65
-rw-r--r--gr-audio-oss/src/audio_oss_sink.cc161
-rw-r--r--gr-audio-oss/src/audio_oss_sink.h66
-rw-r--r--gr-audio-oss/src/audio_oss_source.cc178
-rw-r--r--gr-audio-oss/src/audio_oss_source.h70
-rwxr-xr-xgr-audio-oss/src/qa_oss.py40
-rw-r--r--gr-audio-oss/src/run_tests.in10
14 files changed, 0 insertions, 1017 deletions
diff --git a/gr-audio-oss/.gitignore b/gr-audio-oss/.gitignore
deleted file mode 100644
index cdcf41b15..000000000
--- a/gr-audio-oss/.gitignore
+++ /dev/null
@@ -1,30 +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
diff --git a/gr-audio-oss/Makefile.am b/gr-audio-oss/Makefile.am
deleted file mode 100644
index c55d3ecb7..000000000
--- a/gr-audio-oss/Makefile.am
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# Copyright 2004,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 $(top_srcdir)/Makefile.common
-
-SUBDIRS = src
-
-pkgconfigdir = $(libdir)/pkgconfig
-dist_pkgconfig_DATA = gnuradio-audio-oss.pc
-
-etcdir = $(gr_prefsdir)
-dist_etc_DATA = gr-audio-oss.conf
diff --git a/gr-audio-oss/gnuradio-audio-oss.pc.in b/gr-audio-oss/gnuradio-audio-oss.pc.in
deleted file mode 100644
index 4a215bdab..000000000
--- a/gr-audio-oss/gnuradio-audio-oss.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: gnuradio-audio-oss
-Description: The GNU Radio block for the OSS sound system
-Requires: gnuradio-core
-Version: @LIBVER@
-Libs: -L${libdir} -lgnuradio-audio-oss
-Cflags: -I${includedir}
diff --git a/gr-audio-oss/gr-audio-oss.conf b/gr-audio-oss/gr-audio-oss.conf
deleted file mode 100644
index 6ea14d67e..000000000
--- a/gr-audio-oss/gr-audio-oss.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-# This file contains system wide configuration data for GNU Radio.
-# You may override any setting on a per-user basis by editing
-# ~/.gnuradio/config.conf
-
-[audio_oss]
-
-default_input_device = /dev/dsp
-default_output_device = /dev/dsp
-latency = 0.005 # in seconds
diff --git a/gr-audio-oss/src/.gitignore b/gr-audio-oss/src/.gitignore
deleted file mode 100644
index ac39b2a0a..000000000
--- a/gr-audio-oss/src/.gitignore
+++ /dev/null
@@ -1,14 +0,0 @@
-/Makefile
-/Makefile.in
-/.la
-/.lo
-/.deps
-/.libs
-/*.la
-/*.lo
-/usrp.py
-/usrp.cc
-/audio_oss.cc
-/audio_oss.py
-/run_tests
-/*.pyc
diff --git a/gr-audio-oss/src/Makefile.am b/gr-audio-oss/src/Makefile.am
deleted file mode 100644
index 628c9fd93..000000000
--- a/gr-audio-oss/src/Makefile.am
+++ /dev/null
@@ -1,74 +0,0 @@
-#
-# Copyright 2004,2005,2006,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
-
-AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
-
-EXTRA_DIST = run_tests.in
-
-# C/C++ headers get installed in ${prefix}/include/gnuradio
-grinclude_HEADERS = \
- audio_oss_sink.h \
- audio_oss_source.h
-
-noinst_PYTHON = qa_oss.py
-
-lib_LTLIBRARIES = libgnuradio-audio-oss.la
-
-libgnuradio_audio_oss_la_SOURCES = \
- audio_oss_sink.cc \
- audio_oss_source.cc
-
-libgnuradio_audio_oss_la_LIBADD = \
- $(GNURADIO_CORE_LA) \
- $(OSS_LIBS)
-
-libgnuradio_audio_oss_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS)
-
-if PYTHON
-###################################
-# SWIG Python interface and library
-TESTS = run_tests
-DISTCLEANFILES = run_tests
-
-TOP_SWIG_IFILES = \
- audio_oss.i
-
-# Install so that they end up available as:
-# import gnuradio.audio_oss
-# This ends up at:
-# ${prefix}/lib/python${python_version}/site-packages/gnuradio
-audio_oss_pythondir_category = \
- gnuradio
-
-# additional libraries for linking with the SWIG-generated library
-audio_oss_la_swig_libadd = \
- libgnuradio-audio-oss.la
-
-include $(top_srcdir)/Makefile.swig
-
-# add some of the variables generated inside the Makefile.swig.gen
-BUILT_SOURCES = $(swig_built_sources)
-
-# Do not distribute the output of SWIG
-no_dist_files = $(swig_built_sources)
-endif
diff --git a/gr-audio-oss/src/Makefile.swig.gen b/gr-audio-oss/src/Makefile.swig.gen
deleted file mode 100644
index 6fce10c11..000000000
--- a/gr-audio-oss/src/Makefile.swig.gen
+++ /dev/null
@@ -1,259 +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_oss.i
-
-## Default install locations for these files:
-##
-## Default location for the Python directory is:
-## ${prefix}/lib/python${python_version}/site-packages/[category]/audio_oss
-## Default location for the Python exec directory is:
-## ${exec_prefix}/lib/python${python_version}/site-packages/[category]/audio_oss
-##
-## 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_oss_pythondir_category ?= gnuradio/audio_oss
-audio_oss_pylibdir_category ?= $(audio_oss_pythondir_category)
-audio_oss_pythondir = $(pythondir)/$(audio_oss_pythondir_category)
-audio_oss_pylibdir = $(pyexecdir)/$(audio_oss_pylibdir_category)
-
-## SWIG headers are always installed into the same directory.
-
-audio_oss_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 >
-
-## Stamps used to ensure parallel make does the right thing. These
-## are removed by "make clean", but otherwise unused except during the
-## parallel built. These will not be included in a tarball, because
-## the SWIG-generated files will be removed from the distribution.
-
-STAMPS += $(DEPDIR)/audio_oss-generate-*
-
-## Other cleaned files: dependency files generated by SWIG or this Makefile
-
-MOSTLYCLEANFILES += $(DEPDIR)/*.S*
-
-## Add the .py and .cc files to the list of SWIG built sources. The
-## .h file is sometimes built, but not always ... so that one has to
-## be added manually by the including Makefile.am .
-
-swig_built_sources += audio_oss.py audio_oss.cc
-
-## Various SWIG variables. These can be overloaded in the including
-## Makefile.am by setting the variable value there, then including
-## Makefile.swig .
-
-audio_oss_swiginclude_HEADERS = \
- audio_oss.i \
- $(audio_oss_swiginclude_headers)
-
-audio_oss_pylib_LTLIBRARIES = \
- _audio_oss.la
-
-_audio_oss_la_SOURCES = \
- audio_oss.cc \
- $(audio_oss_la_swig_sources)
-
-_audio_oss_la_LIBADD = \
- $(STD_SWIG_LA_LIB_ADD) \
- $(audio_oss_la_swig_libadd)
-
-_audio_oss_la_LDFLAGS = \
- $(STD_SWIG_LA_LD_FLAGS) \
- $(audio_oss_la_swig_ldflags)
-
-_audio_oss_la_CXXFLAGS = \
- $(STD_SWIG_CXX_FLAGS) \
- $(audio_oss_la_swig_cxxflags)
-
-audio_oss_python_PYTHON = \
- audio_oss.py \
- $(audio_oss_python)
-
-## Entry rule for running SWIG
-
-audio_oss.h audio_oss.py audio_oss.cc: audio_oss.i
-## This rule will get called only when MAKE decides that one of the
-## targets needs to be created or re-created, because:
-##
-## * The .i file is newer than any or all of the generated files;
-##
-## * Any or all of the .cc, .h, or .py files does not exist and is
-## needed (in the case this file is not needed, the rule for it is
-## ignored); or
-##
-## * Some SWIG-based dependecy of the .cc file isn't met and hence the
-## .cc file needs be be regenerated. Explanation: Because MAKE
-## knows how to handle dependencies for .cc files (regardless of
-## their name or extension), then the .cc file is used as a target
-## instead of the .i file -- but with the dependencies of the .i
-## file. It is this last reason why the line:
-##
-## if test -f $@; then :; else
-##
-## cannot be used in this case: If a .i file dependecy is not met,
-## then the .cc file needs to be rebuilt. But if the stamp is newer
-## than the .cc file, and the .cc file exists, then in the original
-## version (with the 'test' above) the internal MAKE call will not
-## be issued and hence the .cc file will not be rebuilt.
-##
-## Once execution gets to here, it should always proceed no matter the
-## state of a stamp (as discussed in link above). The
-## $(DEPDIR)/audio_oss-generate stuff is used to allow for parallel
-## builds to "do the right thing". The stamp has no relationship with
-## either the target files or dependency file; it is used solely for
-## the protection of multiple builds during a given call to MAKE.
-##
-## Catch signals SIGHUP (1), SIGINT (2), SIGPIPE (13), and SIGTERM
-## (15). At a caught signal, the quoted command will be issued before
-## exiting. In this case, remove any stamp, whether temporary of not.
-## The trap is valid until the process exits; the process includes all
-## commands appended via "\"s.
-##
- trap 'rm -rf $(DEPDIR)/audio_oss-generate-*' 1 2 13 15; \
-##
-## Create a temporary directory, which acts as a lock. The first
-## process to create the directory will succeed and issue the MAKE
-## command to do the actual work, while all subsequent processes will
-## fail -- leading them to wait for the first process to finish.
-##
- if mkdir $(DEPDIR)/audio_oss-generate-lock 2>/dev/null; then \
-##
-## This code is being executed by the first process to succeed in
-## creating the directory lock.
-##
-## Remove the stamp associated with this filename.
-##
- rm -f $(DEPDIR)/audio_oss-generate-stamp; \
-##
-## Tell MAKE to run the rule for creating this stamp.
-##
- $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/audio_oss-generate-stamp WHAT=$<; \
-##
-## Now that the .cc, .h, and .py files have been (re)created from the
-## .i file, future checking of this rule during the same MAKE
-## execution will come back that the rule doesn't need to be executed
-## because none of the conditions mentioned at the start of this rule
-## will be positive. Remove the the directory lock, which frees up
-## any waiting process(es) to continue.
-##
- rmdir $(DEPDIR)/audio_oss-generate-lock; \
- else \
-##
-## This code is being executed by any follower processes while the
-## directory lock is in place.
-##
-## Wait until the first process is done, testing once per second.
-##
- while test -d $(DEPDIR)/audio_oss-generate-lock; do \
- sleep 1; \
- done; \
-##
-## Succeed if and only if the first process succeeded; exit this
-## process returning the status of the generated stamp.
-##
- test -f $(DEPDIR)/audio_oss-generate-stamp; \
- exit $$?; \
- fi;
-
-$(DEPDIR)/audio_oss-generate-stamp:
-## This rule will be called only by the first process issuing the
-## above rule to succeed in creating the lock directory, after
-## removing the actual stamp file in order to guarantee that MAKE will
-## execute this rule.
-##
-## Call SWIG to generate the various output files; special
-## post-processing on 'mingw32' host OS for the dependency file.
-##
- if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(audio_oss_swig_args) \
- -MD -MF $(DEPDIR)/audio_oss.Std \
- -module audio_oss -o audio_oss.cc $(WHAT); then \
- if test $(host_os) = mingw32; then \
- $(RM) $(DEPDIR)/audio_oss.Sd; \
- $(SED) 's,\\\\,/,g' < $(DEPDIR)/audio_oss.Std \
- > $(DEPDIR)/audio_oss.Sd; \
- $(RM) $(DEPDIR)/audio_oss.Std; \
- $(MV) $(DEPDIR)/audio_oss.Sd $(DEPDIR)/audio_oss.Std; \
- fi; \
- else \
- $(RM) $(DEPDIR)/audio_oss.S*; exit 1; \
- fi;
-##
-## Mess with the SWIG output .Std dependency file, to create a
-## dependecy file valid for the input .i file: Basically, simulate the
-## dependency file created for libraries by GNU's libtool for C++,
-## where all of the dependencies for the target are first listed, then
-## each individual dependency is listed as a target with no further
-## dependencies.
-##
-## (1) remove the current dependency file
-##
- $(RM) $(DEPDIR)/audio_oss.d
-##
-## (2) Copy the whole SWIG file:
-##
- cp $(DEPDIR)/audio_oss.Std $(DEPDIR)/audio_oss.d
-##
-## (3) all a carriage return to the end of the dependency file.
-##
- echo "" >> $(DEPDIR)/audio_oss.d
-##
-## (4) from the SWIG file, remove the first line (the target); remove
-## trailing " \" and " " from each line. Append ":" to each line,
-## followed by 2 carriage returns, then append this to the end of
-## the dependency file.
-##
- $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/audio_oss.Std | \
- awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/audio_oss.d
-##
-## (5) remove the SWIG-generated file
-##
- $(RM) $(DEPDIR)/audio_oss.Std
-##
-## Create the stamp for this filename generation, to signal success in
-## executing this rule; allows other threads waiting on this process
-## to continue.
-##
- touch $(DEPDIR)/audio_oss-generate-stamp
-
-# KLUDGE: Force runtime include of a SWIG dependency file. This is
-# not guaranteed to be portable, but will probably work. If it works,
-# we have accurate dependencies for our swig stuff, which is good.
-
-@am__include@ @am__quote@./$(DEPDIR)/audio_oss.d@am__quote@
-
diff --git a/gr-audio-oss/src/audio_oss.i b/gr-audio-oss/src/audio_oss.i
deleted file mode 100644
index 0a2e6e6a4..000000000
--- a/gr-audio-oss/src/audio_oss.i
+++ /dev/null
@@ -1,65 +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_oss_sink.h"
-#include "audio_oss_source.h"
-%}
-
-// ----------------------------------------------------------------
-
-GR_SWIG_BLOCK_MAGIC(audio_oss,sink)
-
-audio_oss_sink_sptr
-audio_oss_make_sink (int sampling_rate,
- const std::string dev = "",
- bool ok_to_block = true
- ) throw (std::runtime_error);
-
-
-class audio_oss_sink : public gr_sync_block {
- protected:
- audio_oss_sink (int sampling_rate, const std::string device_name = "", bool ok_to_block = true);
-
- public:
- ~audio_oss_sink ();
-};
-
-// ----------------------------------------------------------------
-
-GR_SWIG_BLOCK_MAGIC(audio_oss,source)
-
-audio_oss_source_sptr
-audio_oss_make_source (int sampling_rate,
- const std::string dev = "",
- bool ok_to_block = true
- ) throw (std::runtime_error);
-
-class audio_oss_source : public gr_sync_block {
- protected:
- audio_oss_source (int sampling_rate, const std::string device_name = "", bool ok_to_block = true);
-
- public:
- ~audio_oss_source ();
-};
diff --git a/gr-audio-oss/src/audio_oss_sink.cc b/gr-audio-oss/src/audio_oss_sink.cc
deleted file mode 100644
index 8230ab9b6..000000000
--- a/gr-audio-oss/src/audio_oss_sink.cc
+++ /dev/null
@@ -1,161 +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_oss_sink.h>
-#include <gr_io_signature.h>
-#include <gr_prefs.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 std::string
-default_device_name ()
-{
- return gr_prefs::singleton()->get_string("audio_oss", "default_output_device", "/dev/dsp");
-}
-
-audio_oss_sink_sptr
-audio_oss_make_sink (int sampling_rate, const std::string dev, bool ok_to_block)
-{
- return gnuradio::get_initial_sptr(new audio_oss_sink (sampling_rate, dev, ok_to_block));
-}
-
-audio_oss_sink::audio_oss_sink (int sampling_rate,
- const std::string device_name,
- bool ok_to_block)
- : gr_sync_block ("audio_oss_sink",
- gr_make_io_signature (1, 2, sizeof (float)),
- gr_make_io_signature (0, 0, 0)),
- d_sampling_rate (sampling_rate),
- d_device_name (device_name.empty() ? default_device_name() : device_name),
- d_fd (-1), d_buffer (0), d_chunk_size (0)
-{
- if ((d_fd = open (d_device_name.c_str (), O_WRONLY)) < 0){
- fprintf (stderr, "audio_oss_sink: ");
- perror (d_device_name.c_str ());
- throw std::runtime_error ("audio_oss_sink");
- }
-
- double CHUNK_TIME =
- std::max(0.001, gr_prefs::singleton()->get_double("audio_oss", "latency", 0.005));
-
- d_chunk_size = (int) (d_sampling_rate * 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_oss_sink: " << d_device_name << " ioctl failed\n";
- perror (d_device_name.c_str ());
- throw std::runtime_error ("audio_oss_sink");
- }
-
- if (format != orig_format){
- fprintf (stderr, "audio_oss_sink: 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_oss_sink: could not set STEREO mode");
- throw std::runtime_error ("audio_oss_sink");
- }
-
- // set sampling freq
- int sf = sampling_rate;
- if (ioctl (d_fd, SNDCTL_DSP_SPEED, &sf) < 0){
- std::cerr << "audio_oss_sink: "
- << d_device_name << ": invalid sampling_rate "
- << sampling_rate << "\n";
- sampling_rate = 8000;
- if (ioctl (d_fd, SNDCTL_DSP_SPEED, &sf) < 0){
- std::cerr << "audio_oss_sink: failed to set sampling_rate to 8000\n";
- throw std::runtime_error ("audio_oss_sink");
- }
- }
-}
-
-audio_oss_sink::~audio_oss_sink ()
-{
- close (d_fd);
- delete [] d_buffer;
-}
-
-
-int
-audio_oss_sink::work (int noutput_items,
- gr_vector_const_void_star &input_items,
- gr_vector_void_star &output_items)
-{
- const float *f0, *f1;
-
- 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 (d_fd, d_buffer, 2 * d_chunk_size * sizeof (short)) < 0)
- perror ("audio_oss_sink: write");
- }
- 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 (d_fd, d_buffer, 2 * d_chunk_size * sizeof (short)) < 0)
- perror ("audio_oss_sink: write");
- }
- break;
- }
-
- return noutput_items;
-}
diff --git a/gr-audio-oss/src/audio_oss_sink.h b/gr-audio-oss/src/audio_oss_sink.h
deleted file mode 100644
index 052faac13..000000000
--- a/gr-audio-oss/src/audio_oss_sink.h
+++ /dev/null
@@ -1,66 +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_OSS_SINK_H
-#define INCLUDED_AUDIO_OSS_SINK_H
-
-#include <gr_sync_block.h>
-#include <string>
-
-
-class audio_oss_sink;
-typedef boost::shared_ptr<audio_oss_sink> audio_oss_sink_sptr;
-
-audio_oss_sink_sptr
-audio_oss_make_sink (int sampling_rate,
- const std::string dev = "",
- bool ok_to_block = true);
-
-/*!
- * \brief audio sink using OSS
- *
- * input signature is one or two streams of floats.
- * Input samples must be in the range [-1,1].
- */
-
-class audio_oss_sink : public gr_sync_block {
- friend audio_oss_sink_sptr
- audio_oss_make_sink (int sampling_rate, const std::string device_name, bool ok_to_block);
-
- int d_sampling_rate;
- std::string d_device_name;
- int d_fd;
- short *d_buffer;
- int d_chunk_size;
-
- protected:
- audio_oss_sink (int sampling_rate, const std::string device_name = "", bool ok_to_block = true);
-
- public:
- ~audio_oss_sink ();
-
- int work (int noutput_items,
- gr_vector_const_void_star &input_items,
- gr_vector_void_star &output_items);
-};
-
-#endif /* INCLUDED_AUDIO_OSS_SINK_H */
diff --git a/gr-audio-oss/src/audio_oss_source.cc b/gr-audio-oss/src/audio_oss_source.cc
deleted file mode 100644
index fbb898f8c..000000000
--- a/gr-audio-oss/src/audio_oss_source.cc
+++ /dev/null
@@ -1,178 +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_oss_source.h>
-#include <gr_io_signature.h>
-#include <gr_prefs.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 std::string
-default_device_name ()
-{
- return gr_prefs::singleton()->get_string("audio_oss", "default_input_device", "/dev/dsp");
-}
-
-audio_oss_source_sptr
-audio_oss_make_source (int sampling_rate, const std::string dev, bool ok_to_block)
-{
- return gnuradio::get_initial_sptr(new audio_oss_source (sampling_rate, dev, ok_to_block));
-}
-
-
-audio_oss_source::audio_oss_source (int sampling_rate,
- const std::string device_name,
- bool ok_to_block)
- : gr_sync_block ("audio_oss_source",
- gr_make_io_signature (0, 0, 0),
- gr_make_io_signature (1, 2, sizeof (float))),
- d_sampling_rate (sampling_rate),
- d_device_name (device_name.empty() ? default_device_name() : device_name),
- d_fd (-1), d_buffer (0), d_chunk_size (0)
-{
- if ((d_fd = open (d_device_name.c_str (), O_RDONLY)) < 0){
- fprintf (stderr, "audio_oss_source: ");
- perror (d_device_name.c_str ());
- throw std::runtime_error ("audio_oss_source");
- }
-
- double CHUNK_TIME =
- std::max(0.001, gr_prefs::singleton()->get_double("audio_oss", "latency", 0.005));
-
- d_chunk_size = (int) (d_sampling_rate * 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_oss_source: " << d_device_name << " ioctl failed\n";
- perror (d_device_name.c_str ());
- throw std::runtime_error ("audio_oss_source");
- }
-
- if (format != orig_format){
- fprintf (stderr, "audio_oss_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_oss_source: could not set STEREO mode");
- throw std::runtime_error ("audio_oss_source");
- }
-
- // set sampling freq
- int sf = sampling_rate;
- if (ioctl (d_fd, SNDCTL_DSP_SPEED, &sf) < 0){
- std::cerr << "audio_oss_source: "
- << d_device_name << ": invalid sampling_rate "
- << sampling_rate << "\n";
- sampling_rate = 8000;
- if (ioctl (d_fd, SNDCTL_DSP_SPEED, &sf) < 0){
- std::cerr << "audio_oss_source: failed to set sampling_rate to 8000\n";
- throw std::runtime_error ("audio_oss_source");
- }
- }
-}
-
-audio_oss_source::~audio_oss_source ()
-{
- close (d_fd);
- delete [] d_buffer;
-}
-
-int
-audio_oss_source::work (int noutput_items,
- gr_vector_const_void_star &input_items,
- gr_vector_void_star &output_items)
-{
- 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.
-
- 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_oss_source");
- return -1; // say we're done
- }
-
- if ((result_nbytes & (bytes_per_item - 1)) != 0){
- fprintf (stderr, "audio_oss_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;
-}
diff --git a/gr-audio-oss/src/audio_oss_source.h b/gr-audio-oss/src/audio_oss_source.h
deleted file mode 100644
index 22d4392e2..000000000
--- a/gr-audio-oss/src/audio_oss_source.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004,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_OSS_SOURCE_H
-#define INCLUDED_AUDIO_OSS_SOURCE_H
-
-#include <gr_sync_block.h>
-#include <string>
-
-
-class audio_oss_source;
-typedef boost::shared_ptr<audio_oss_source> audio_oss_source_sptr;
-
-audio_oss_source_sptr
-audio_oss_make_source (int sampling_rate,
- const std::string dev = "",
- bool ok_to_block = true);
-
-/*!
- * \brief audio source using OSS
- *
- * Output signature is one or two streams of floats.
- * Output samples will be in the range [-1,1].
- */
-
-class audio_oss_source : public gr_sync_block {
- friend audio_oss_source_sptr
- audio_oss_make_source (int sampling_rate, const std::string device_name, bool ok_to_block);
-
- int d_sampling_rate;
- std::string d_device_name;
- int d_fd;
- short *d_buffer;
- int d_chunk_size;
-
- protected:
- audio_oss_source (int sampling_rate,
- const std::string device_name = "",
- bool ok_to_block = true);
-
- public:
- ~audio_oss_source ();
-
- int work (int noutput_items,
- gr_vector_const_void_star &input_items,
- gr_vector_void_star &output_items);
-};
-
-
-
-#endif /* INCLUDED_AUDIO_OSS_SOURCE_H */
diff --git a/gr-audio-oss/src/qa_oss.py b/gr-audio-oss/src/qa_oss.py
deleted file mode 100755
index 365dabc25..000000000
--- a/gr-audio-oss/src/qa_oss.py
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2005,2007,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_oss
-
-class test_audio_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 OSS drivers, etc. Don't try to run anything"""
- pass
-
-if __name__ == '__main__':
- gr_unittest.run(test_audio_oss, "test_audio_oss.xml")
diff --git a/gr-audio-oss/src/run_tests.in b/gr-audio-oss/src/run_tests.in
deleted file mode 100644
index b1a64c212..000000000
--- a/gr-audio-oss/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-oss \
- @abs_top_builddir@/gr-audio-oss \
- @srcdir@