diff options
| -rw-r--r-- | gr-audio/include/gr_audio_sink.h | 8 | ||||
| -rw-r--r-- | gr-audio/include/gr_audio_source.h | 8 | ||||
| -rw-r--r-- | gr-audio/lib/audio_alsa_sink.cc | 6 | ||||
| -rw-r--r-- | gr-audio/lib/audio_alsa_sink.h | 2 | ||||
| -rw-r--r-- | gr-audio/lib/audio_alsa_source.cc | 6 | ||||
| -rw-r--r-- | gr-audio/lib/audio_alsa_source.h | 2 | ||||
| -rw-r--r-- | gr-audio/lib/gr_audio_registry.cc | 12 | ||||
| -rw-r--r-- | gr-audio/lib/gr_audio_registry.h | 30 | ||||
| -rw-r--r-- | gr-audio/swig/.gitignore | 3 | ||||
| -rw-r--r-- | gr-audio/swig/Makefile.am | 35 | ||||
| -rw-r--r-- | gr-audio/swig/Makefile.swig.gen | 145 | ||||
| -rw-r--r-- | gr-audio/swig/__init__.py | 22 | ||||
| -rw-r--r-- | gr-audio/swig/audio_swig.i | 63 |
13 files changed, 305 insertions, 37 deletions
diff --git a/gr-audio/include/gr_audio_sink.h b/gr-audio/include/gr_audio_sink.h index 1a8585b82..c76ec6550 100644 --- a/gr-audio/include/gr_audio_sink.h +++ b/gr-audio/include/gr_audio_sink.h @@ -25,11 +25,11 @@ #include <gr_audio_api.h> #include <gr_sync_block.h> -class GR_AUDIO_API gr_audio_sink : public gr_sync_block{ +class GR_AUDIO_API audio_sink : public gr_sync_block{ public: - typedef boost::shared_ptr<gr_audio_sink> sptr; + typedef boost::shared_ptr<audio_sink> sptr; - gr_audio_sink( + audio_sink( const std::string &name, gr_io_signature_sptr insig, gr_io_signature_sptr outsig @@ -37,7 +37,7 @@ public: }; -GR_AUDIO_API gr_audio_sink::sptr gr_make_audio_sink( +GR_AUDIO_API audio_sink::sptr audio_make_sink( int sampling_rate, const std::string device_name = "", bool ok_to_block = true diff --git a/gr-audio/include/gr_audio_source.h b/gr-audio/include/gr_audio_source.h index 446d41cf4..ed3c31c10 100644 --- a/gr-audio/include/gr_audio_source.h +++ b/gr-audio/include/gr_audio_source.h @@ -25,11 +25,11 @@ #include <gr_audio_api.h> #include <gr_sync_block.h> -class GR_AUDIO_API gr_audio_source : public gr_sync_block{ +class GR_AUDIO_API audio_source : public gr_sync_block{ public: - typedef boost::shared_ptr<gr_audio_source> sptr; + typedef boost::shared_ptr<audio_source> sptr; - gr_audio_source( + audio_source( const std::string &name, gr_io_signature_sptr insig, gr_io_signature_sptr outsig @@ -37,7 +37,7 @@ public: }; -GR_AUDIO_API gr_audio_source::sptr gr_make_audio_source( +GR_AUDIO_API audio_source::sptr audio_make_source( int sampling_rate, const std::string device_name = "", bool ok_to_block = true diff --git a/gr-audio/lib/audio_alsa_sink.cc b/gr-audio/lib/audio_alsa_sink.cc index e02dfc31f..af5cc02be 100644 --- a/gr-audio/lib/audio_alsa_sink.cc +++ b/gr-audio/lib/audio_alsa_sink.cc @@ -33,10 +33,10 @@ #include <stdexcept> #include <gri_alsa.h> -GR_AUDIO_REGISTER_SINK(alsa)( +AUDIO_REGISTER_SINK(alsa)( int sampling_rate, const std::string &device_name, bool ok_to_block ){ - return gr_audio_sink::sptr(new audio_alsa_sink(sampling_rate, device_name, ok_to_block)); + return audio_sink::sptr(new audio_alsa_sink(sampling_rate, device_name, ok_to_block)); } static bool CHATTY_DEBUG = false; @@ -74,7 +74,7 @@ default_nperiods () audio_alsa_sink::audio_alsa_sink (int sampling_rate, const std::string device_name, bool ok_to_block) - : gr_audio_sink ("audio_alsa_sink", + : audio_sink ("audio_alsa_sink", gr_make_io_signature (0, 0, 0), gr_make_io_signature (0, 0, 0)), d_sampling_rate (sampling_rate), diff --git a/gr-audio/lib/audio_alsa_sink.h b/gr-audio/lib/audio_alsa_sink.h index aa3e88058..23e406d6b 100644 --- a/gr-audio/lib/audio_alsa_sink.h +++ b/gr-audio/lib/audio_alsa_sink.h @@ -40,7 +40,7 @@ * * Input samples must be in the range [-1,1]. */ -class audio_alsa_sink : public gr_audio_sink { +class audio_alsa_sink : public audio_sink { // typedef for pointer to class work method typedef int (audio_alsa_sink::*work_t)(int noutput_items, gr_vector_const_void_star &input_items, diff --git a/gr-audio/lib/audio_alsa_source.cc b/gr-audio/lib/audio_alsa_source.cc index 33c2c3932..a8667361e 100644 --- a/gr-audio/lib/audio_alsa_source.cc +++ b/gr-audio/lib/audio_alsa_source.cc @@ -33,10 +33,10 @@ #include <stdexcept> #include <gri_alsa.h> -GR_AUDIO_REGISTER_SOURCE(alsa)( +AUDIO_REGISTER_SOURCE(alsa)( int sampling_rate, const std::string &device_name, bool ok_to_block ){ - return gr_audio_source::sptr(new audio_alsa_source(sampling_rate, device_name, ok_to_block)); + return audio_source::sptr(new audio_alsa_source(sampling_rate, device_name, ok_to_block)); } static bool CHATTY_DEBUG = false; @@ -73,7 +73,7 @@ default_nperiods () audio_alsa_source::audio_alsa_source (int sampling_rate, const std::string device_name, bool ok_to_block) - : gr_audio_source ("audio_alsa_source", + : audio_source ("audio_alsa_source", gr_make_io_signature (0, 0, 0), gr_make_io_signature (0, 0, 0)), d_sampling_rate (sampling_rate), diff --git a/gr-audio/lib/audio_alsa_source.h b/gr-audio/lib/audio_alsa_source.h index 8ddc00bd2..e38af3872 100644 --- a/gr-audio/lib/audio_alsa_source.h +++ b/gr-audio/lib/audio_alsa_source.h @@ -43,7 +43,7 @@ typedef boost::shared_ptr<audio_alsa_source> audio_alsa_source_sptr; * * Output samples will be in the range [-1,1]. */ -class audio_alsa_source : public gr_audio_source { +class audio_alsa_source : public audio_source { // typedef for pointer to class work method typedef int (audio_alsa_source::*work_t)(int noutput_items, gr_vector_const_void_star &input_items, diff --git a/gr-audio/lib/gr_audio_registry.cc b/gr-audio/lib/gr_audio_registry.cc index 708601489..be1337101 100644 --- a/gr-audio/lib/gr_audio_registry.cc +++ b/gr-audio/lib/gr_audio_registry.cc @@ -40,18 +40,18 @@ static std::vector<std::pair<std::string, sink_factory_t> > &get_sink_registry(v /*********************************************************************** * Register functions **********************************************************************/ -void gr_audio_register_source(const std::string &name, source_factory_t source){ +void audio_register_source(const std::string &name, source_factory_t source){ get_source_registry().push_back(std::make_pair(name, source)); } -void gr_audio_register_sink(const std::string &name, sink_factory_t sink){ +void audio_register_sink(const std::string &name, sink_factory_t sink){ get_sink_registry().push_back(std::make_pair(name, sink)); } /*********************************************************************** * Factory functions **********************************************************************/ -gr_audio_source::sptr gr_make_audio_source( +audio_source::sptr audio_make_source( int sampling_rate, const std::string device_name, bool ok_to_block @@ -63,7 +63,7 @@ gr_audio_source::sptr gr_make_audio_source( return get_source_registry().front().second(sampling_rate, device_name, ok_to_block); } -gr_audio_sink::sptr gr_make_audio_sink( +audio_sink::sptr audio_make_sink( int sampling_rate, const std::string device_name, bool ok_to_block @@ -80,7 +80,7 @@ gr_audio_sink::sptr gr_make_audio_sink( **********************************************************************/ #include <gr_io_signature.h> -gr_audio_sink::gr_audio_sink( +audio_sink::audio_sink( const std::string &name, gr_io_signature_sptr insig, gr_io_signature_sptr outsig @@ -88,7 +88,7 @@ gr_audio_sink::gr_audio_sink( gr_sync_block(name, insig, outsig) {} -gr_audio_source::gr_audio_source( +audio_source::audio_source( const std::string &name, gr_io_signature_sptr insig, gr_io_signature_sptr outsig diff --git a/gr-audio/lib/gr_audio_registry.h b/gr-audio/lib/gr_audio_registry.h index b84665017..71f6ad11d 100644 --- a/gr-audio/lib/gr_audio_registry.h +++ b/gr-audio/lib/gr_audio_registry.h @@ -26,24 +26,24 @@ #include <gr_audio_source.h> #include <string> -typedef gr_audio_source::sptr(*source_factory_t)(int, const std::string &, bool); -typedef gr_audio_sink::sptr(*sink_factory_t)(int, const std::string &, bool); +typedef audio_source::sptr(*source_factory_t)(int, const std::string &, bool); +typedef audio_sink::sptr(*sink_factory_t)(int, const std::string &, bool); -void gr_audio_register_source(const std::string &name, source_factory_t source); -void gr_audio_register_sink(const std::string &name, sink_factory_t sink); +void audio_register_source(const std::string &name, source_factory_t source); +void audio_register_sink(const std::string &name, sink_factory_t sink); -#define GR_AUDIO_REGISTER_FIXTURE(x) static struct x{x();}x;x::x() +#define AUDIO_REGISTER_FIXTURE(x) static struct x{x();}x;x::x() -#define GR_AUDIO_REGISTER_SOURCE(name) \ - static gr_audio_source::sptr name##_source_fcn(int, const std::string &, bool); \ - GR_AUDIO_REGISTER_FIXTURE(name##_source_reg){ \ - gr_audio_register_source(#name, &name##_source_fcn); \ - } static gr_audio_source::sptr name##_source_fcn +#define AUDIO_REGISTER_SOURCE(name) \ + static audio_source::sptr name##_source_fcn(int, const std::string &, bool); \ + AUDIO_REGISTER_FIXTURE(name##_source_reg){ \ + audio_register_source(#name, &name##_source_fcn); \ + } static audio_source::sptr name##_source_fcn -#define GR_AUDIO_REGISTER_SINK(name) \ - static gr_audio_sink::sptr name##_sink_fcn(int, const std::string &, bool); \ - GR_AUDIO_REGISTER_FIXTURE(name##_sink_reg){ \ - gr_audio_register_sink(#name, &name##_sink_fcn); \ - } static gr_audio_sink::sptr name##_sink_fcn +#define AUDIO_REGISTER_SINK(name) \ + static audio_sink::sptr name##_sink_fcn(int, const std::string &, bool); \ + AUDIO_REGISTER_FIXTURE(name##_sink_reg){ \ + audio_register_sink(#name, &name##_sink_fcn); \ + } static audio_sink::sptr name##_sink_fcn #endif /* INCLUDED_GR_AUDIO_REGISTRY_H */ diff --git a/gr-audio/swig/.gitignore b/gr-audio/swig/.gitignore index b336cc7ce..7fd371091 100644 --- a/gr-audio/swig/.gitignore +++ b/gr-audio/swig/.gitignore @@ -1,2 +1,5 @@ +/audio_swig.cc +/audio_swig.py /Makefile /Makefile.in +/python diff --git a/gr-audio/swig/Makefile.am b/gr-audio/swig/Makefile.am index d5b319c36..d95e4c5d5 100644 --- a/gr-audio/swig/Makefile.am +++ b/gr-audio/swig/Makefile.am @@ -20,3 +20,38 @@ # include $(top_srcdir)/Makefile.common +include $(top_srcdir)/Makefile.swig + +AUDIO_CPPFLAGS = -I$(abs_top_srcdir)/gr-audio/include + +AM_CPPFLAGS = \ + $(STD_DEFINES_AND_INCLUDES) \ + $(PYTHON_CPPFLAGS) \ + $(AUDIO_CPPFLAGS) \ + $(WITH_INCLUDES) + +# ---------------------------------------------------------------- +# The SWIG library + +TOP_SWIG_IFILES = \ + audio_swig.i + +# Install so that they end up available as: +# import gnuradio.audio +# This ends up at: +# ${prefix}/lib/python${python_version}/site-packages/gnuradio/audio +audio_swig_pythondir_category = \ + gnuradio/audio + +# additional libraries for linking with the SWIG-generated library +audio_swig_la_swig_libadd = \ + $(top_builddir)/gr-audio/lib/libgnuradio-audio.la + +# additional Python files to be installed along with the SWIG-generated one +audio_swig_python = \ + __init__.py + +# additional SWIG files to be installed +audio_swig_swiginclude_headers = + +audio_swig_swig_args = $(AUDIO_CPPFLAGS) diff --git a/gr-audio/swig/Makefile.swig.gen b/gr-audio/swig/Makefile.swig.gen new file mode 100644 index 000000000..7cdf04665 --- /dev/null +++ b/gr-audio/swig/Makefile.swig.gen @@ -0,0 +1,145 @@ +# -*- Makefile -*- +# +# Copyright 2011 Free Software Foundation, Inc. +# +# This file is part of GNU Radio +# +# GNU Radio is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3, or (at your option) +# any later version. +# +# GNU Radio is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with GNU Radio; see the file COPYING. If not, write to +# the Free Software Foundation, Inc., 51 Franklin Street, +# Boston, MA 02110-1301, USA. +# + +# Makefile.swig.gen for audio_swig.i + +## Default install locations for these files: +## +## Default location for the Python directory is: +## ${prefix}/lib/python${python_version}/site-packages/[category]/audio_swig +## Default location for the Python exec directory is: +## ${exec_prefix}/lib/python${python_version}/site-packages/[category]/audio_swig +## +## 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_swig_pythondir_category ?= gnuradio/audio_swig +audio_swig_pylibdir_category ?= $(audio_swig_pythondir_category) +audio_swig_pythondir = $(pythondir)/$(audio_swig_pythondir_category) +audio_swig_pylibdir = $(pyexecdir)/$(audio_swig_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_swig_scmlibdir = $(libdir) + +# The scm files for the guile modules get installed where ever guile +# is installed, usually /usr/share/guile/site/audio_swig +# FIXME: determince whether these should be installed with gnuradio. +audio_swig_scmdir = $(guiledir) + +## SWIG headers are always installed into the same directory. + +audio_swig_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_swig_swiginclude_HEADERS = \ + audio_swig.i \ + $(audio_swig_swiginclude_headers) + +if PYTHON +audio_swig_pylib_LTLIBRARIES = \ + _audio_swig.la + +_audio_swig_la_SOURCES = \ + python/audio_swig.cc \ + $(audio_swig_la_swig_sources) + +audio_swig_python_PYTHON = \ + audio_swig.py \ + $(audio_swig_python) + +_audio_swig_la_LIBADD = \ + $(STD_SWIG_LA_LIB_ADD) \ + $(audio_swig_la_swig_libadd) + +_audio_swig_la_LDFLAGS = \ + $(STD_SWIG_LA_LD_FLAGS) \ + $(audio_swig_la_swig_ldflags) + +_audio_swig_la_CXXFLAGS = \ + $(STD_SWIG_CXX_FLAGS) \ + -I$(top_builddir) \ + $(audio_swig_la_swig_cxxflags) + +python/audio_swig.cc: audio_swig.py +audio_swig.py: audio_swig.i + +# Include the python dependencies for this file +-include python/audio_swig.d + +endif # end of if python + +if GUILE + +audio_swig_scmlib_LTLIBRARIES = \ + libguile-gnuradio-audio_swig.la +libguile_gnuradio_audio_swig_la_SOURCES = \ + guile/audio_swig.cc \ + $(audio_swig_la_swig_sources) +nobase_audio_swig_scm_DATA = \ + gnuradio/audio_swig.scm \ + gnuradio/audio_swig-primitive.scm +libguile_gnuradio_audio_swig_la_LIBADD = \ + $(STD_SWIG_LA_LIB_ADD) \ + $(audio_swig_la_swig_libadd) +libguile_gnuradio_audio_swig_la_LDFLAGS = \ + $(STD_SWIG_LA_LD_FLAGS) \ + $(audio_swig_la_swig_ldflags) +libguile_gnuradio_audio_swig_la_CXXFLAGS = \ + $(STD_SWIG_CXX_FLAGS) \ + -I$(top_builddir) \ + $(audio_swig_la_swig_cxxflags) + +guile/audio_swig.cc: gnuradio/audio_swig.scm +gnuradio/audio_swig.scm: audio_swig.i +gnuradio/audio_swig-primitive.scm: gnuradio/audio_swig.scm + +# Include the guile dependencies for this file +-include guile/audio_swig.d + +endif # end of GUILE + + diff --git a/gr-audio/swig/__init__.py b/gr-audio/swig/__init__.py new file mode 100644 index 000000000..23efda07e --- /dev/null +++ b/gr-audio/swig/__init__.py @@ -0,0 +1,22 @@ +# +# Copyright 2011 Free Software Foundation, Inc. +# +# This file is part of GNU Radio +# +# GNU Radio is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3, or (at your option) +# any later version. +# +# GNU Radio is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with GNU Radio; see the file COPYING. If not, write to +# the Free Software Foundation, Inc., 51 Franklin Street, +# Boston, MA 02110-1301, USA. +# + +from audio_swig import * diff --git a/gr-audio/swig/audio_swig.i b/gr-audio/swig/audio_swig.i new file mode 100644 index 000000000..612e96d23 --- /dev/null +++ b/gr-audio/swig/audio_swig.i @@ -0,0 +1,63 @@ +/* + * Copyright 2011 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * GNU Radio is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3, or (at your option) + * any later version. + * + * GNU Radio is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with GNU Radio; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, + * Boston, MA 02110-1301, USA. + */ + + +#define GR_AUDIO_API + +//////////////////////////////////////////////////////////////////////// +// Language independent exception handler +//////////////////////////////////////////////////////////////////////// +%include exception.i + +%exception { + try { + $action + } + catch(std::exception &e) { + SWIG_exception(SWIG_RuntimeError, e.what()); + } + catch(...) { + SWIG_exception(SWIG_RuntimeError, "Unknown exception"); + } + +} + +//////////////////////////////////////////////////////////////////////// +// standard includes +//////////////////////////////////////////////////////////////////////// +%include "gnuradio.i" + +//////////////////////////////////////////////////////////////////////// +// block headers +//////////////////////////////////////////////////////////////////////// +%{ +#include <gr_audio_source.h> +#include <gr_audio_sink.h> +%} + +//////////////////////////////////////////////////////////////////////// +// block magic +//////////////////////////////////////////////////////////////////////// +GR_SWIG_BLOCK_MAGIC(audio,source) +%include <gr_audio_source.h> + +GR_SWIG_BLOCK_MAGIC(audio,sink) +%include <gr_audio_sink.h> |