diff options
author | Josh Blum | 2011-03-08 23:13:13 -0800 |
---|---|---|
committer | Josh Blum | 2011-03-08 23:13:13 -0800 |
commit | b9b5318101d596b8f06cf5640ddceb90bdb9235c (patch) | |
tree | 900e798e8543d6d89eabdd86daf53c8553dd7d73 | |
parent | 8eeba059728257812924ed5b70b9e1e97d98886f (diff) | |
download | gnuradio-b9b5318101d596b8f06cf5640ddceb90bdb9235c.tar.gz gnuradio-b9b5318101d596b8f06cf5640ddceb90bdb9235c.tar.bz2 gnuradio-b9b5318101d596b8f06cf5640ddceb90bdb9235c.zip |
audio: skeleton for gr-audio component
-rw-r--r-- | config/grc_gr_audio.m4 | 35 | ||||
-rw-r--r-- | configure.ac | 13 | ||||
-rw-r--r-- | gr-audio/.gitignore | 3 | ||||
-rw-r--r-- | gr-audio/Makefile.am | 29 | ||||
-rw-r--r-- | gr-audio/gnuradio-audio.pc.in | 11 | ||||
-rw-r--r-- | gr-audio/gr-audio.conf | 3 | ||||
-rw-r--r-- | gr-audio/include/.gitignore | 2 | ||||
-rw-r--r-- | gr-audio/include/Makefile.am | 22 | ||||
-rw-r--r-- | gr-audio/lib/.gitignore | 2 | ||||
-rw-r--r-- | gr-audio/lib/Makefile.am | 22 | ||||
-rw-r--r-- | gr-audio/swig/.gitignore | 2 | ||||
-rw-r--r-- | gr-audio/swig/Makefile.am | 22 |
12 files changed, 160 insertions, 6 deletions
diff --git a/config/grc_gr_audio.m4 b/config/grc_gr_audio.m4 new file mode 100644 index 000000000..d20f10154 --- /dev/null +++ b/config/grc_gr_audio.m4 @@ -0,0 +1,35 @@ +dnl Copyright 2011 Free Software Foundation, Inc. +dnl +dnl This file is part of GNU Radio +dnl +dnl GNU Radio is free software; you can redistribute it and/or modify +dnl it under the terms of the GNU General Public License as published by +dnl the Free Software Foundation; either version 3, or (at your option) +dnl any later version. +dnl +dnl GNU Radio is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +dnl GNU General Public License for more details. +dnl +dnl You should have received a copy of the GNU General Public License +dnl along with GNU Radio; see the file COPYING. If not, write to +dnl the Free Software Foundation, Inc., 51 Franklin Street, +dnl Boston, MA 02110-1301, USA. + +AC_DEFUN([GRC_GR_AUDIO],[ + GRC_ENABLE(gr-audio) + + dnl Don't do gr-audio-alsa if gnuradio-core skipped + GRC_CHECK_DEPENDENCY(gr-audio, gnuradio-core) + + AC_CONFIG_FILES([ \ + gr-audio/Makefile \ + gr-audio/include/Makefile \ + gr-audio/lib/Makefile \ + gr-audio/swig/Makefile \ + gr-audio/gnuradio-audio.pc \ + ]) + + GRC_BUILD_CONDITIONAL(gr-audio) +]) diff --git a/configure.ac b/configure.ac index 7546eb302..82da2b1aa 100644 --- a/configure.ac +++ b/configure.ac @@ -367,12 +367,13 @@ GRC_GR_USRP dnl this must come after GRC_USRP GRC_GR_USRP2 GRC_GR_GCELL dnl this must come after GRC_GCELL and GRC_GNURADIO_CORE GRC_GR_MSDD6000 -GRC_GR_AUDIO_ALSA -GRC_GR_AUDIO_JACK -GRC_GR_AUDIO_OSS -GRC_GR_AUDIO_OSX -GRC_GR_AUDIO_PORTAUDIO -GRC_GR_AUDIO_WINDOWS +GRC_GR_AUDIO +#GRC_GR_AUDIO_ALSA +#GRC_GR_AUDIO_JACK +#GRC_GR_AUDIO_OSS +#GRC_GR_AUDIO_OSX +#GRC_GR_AUDIO_PORTAUDIO +#GRC_GR_AUDIO_WINDOWS GRC_GR_ATSC GRC_GR_COMEDI GRC_GR_CVSD_VOCODER diff --git a/gr-audio/.gitignore b/gr-audio/.gitignore new file mode 100644 index 000000000..a37fc0c1a --- /dev/null +++ b/gr-audio/.gitignore @@ -0,0 +1,3 @@ +/Makefile +/Makefile.in +/*.pc diff --git a/gr-audio/Makefile.am b/gr-audio/Makefile.am new file mode 100644 index 000000000..092d9b980 --- /dev/null +++ b/gr-audio/Makefile.am @@ -0,0 +1,29 @@ +# +# 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. +# + +include $(top_srcdir)/Makefile.common + +SUBDIRS = include lib + +if PYTHON +SUBDIRS += swig +endif + diff --git a/gr-audio/gnuradio-audio.pc.in b/gr-audio/gnuradio-audio.pc.in new file mode 100644 index 000000000..1cd6d4051 --- /dev/null +++ b/gr-audio/gnuradio-audio.pc.in @@ -0,0 +1,11 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: gnuradio-audio +Description: The GNU Radio block for all supported audio sound systems +Requires: gnuradio-core +Version: @LIBVER@ +Libs: -L${libdir} -lgnuradio-audio +Cflags: -I${includedir} diff --git a/gr-audio/gr-audio.conf b/gr-audio/gr-audio.conf new file mode 100644 index 000000000..a79413d1a --- /dev/null +++ b/gr-audio/gr-audio.conf @@ -0,0 +1,3 @@ +# 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 diff --git a/gr-audio/include/.gitignore b/gr-audio/include/.gitignore new file mode 100644 index 000000000..b336cc7ce --- /dev/null +++ b/gr-audio/include/.gitignore @@ -0,0 +1,2 @@ +/Makefile +/Makefile.in diff --git a/gr-audio/include/Makefile.am b/gr-audio/include/Makefile.am new file mode 100644 index 000000000..d5b319c36 --- /dev/null +++ b/gr-audio/include/Makefile.am @@ -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. +# + +include $(top_srcdir)/Makefile.common diff --git a/gr-audio/lib/.gitignore b/gr-audio/lib/.gitignore new file mode 100644 index 000000000..b336cc7ce --- /dev/null +++ b/gr-audio/lib/.gitignore @@ -0,0 +1,2 @@ +/Makefile +/Makefile.in diff --git a/gr-audio/lib/Makefile.am b/gr-audio/lib/Makefile.am new file mode 100644 index 000000000..d5b319c36 --- /dev/null +++ b/gr-audio/lib/Makefile.am @@ -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. +# + +include $(top_srcdir)/Makefile.common diff --git a/gr-audio/swig/.gitignore b/gr-audio/swig/.gitignore new file mode 100644 index 000000000..b336cc7ce --- /dev/null +++ b/gr-audio/swig/.gitignore @@ -0,0 +1,2 @@ +/Makefile +/Makefile.in diff --git a/gr-audio/swig/Makefile.am b/gr-audio/swig/Makefile.am new file mode 100644 index 000000000..d5b319c36 --- /dev/null +++ b/gr-audio/swig/Makefile.am @@ -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. +# + +include $(top_srcdir)/Makefile.common |