From b9b5318101d596b8f06cf5640ddceb90bdb9235c Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Tue, 8 Mar 2011 23:13:13 -0800 Subject: audio: skeleton for gr-audio component --- config/grc_gr_audio.m4 | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 config/grc_gr_audio.m4 (limited to 'config/grc_gr_audio.m4') 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) +]) -- cgit From 24d30ff306a906b21ad724c07a95caed24659887 Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Wed, 9 Mar 2011 10:29:53 -0800 Subject: audio: work to get alsa support in, lets see if this works before adding more --- config/grc_gr_audio.m4 | 3 +++ 1 file changed, 3 insertions(+) (limited to 'config/grc_gr_audio.m4') diff --git a/config/grc_gr_audio.m4 b/config/grc_gr_audio.m4 index d20f10154..9ca03a045 100644 --- a/config/grc_gr_audio.m4 +++ b/config/grc_gr_audio.m4 @@ -23,6 +23,9 @@ AC_DEFUN([GRC_GR_AUDIO],[ dnl Don't do gr-audio-alsa if gnuradio-core skipped GRC_CHECK_DEPENDENCY(gr-audio, gnuradio-core) + PKG_CHECK_MODULES(ALSA, alsa >= 0.9,[GR_AUDIO_ALSA_SUPPORT=true],[GR_AUDIO_ALSA_SUPPORT=false]) + AM_CONDITIONAL(GR_AUDIO_ALSA_SUPPORT, $GR_AUDIO_ALSA_SUPPORT) + AC_CONFIG_FILES([ \ gr-audio/Makefile \ gr-audio/include/Makefile \ -- cgit From 0644b009591f4c63ed05a8095a0c54c1501bac71 Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Wed, 9 Mar 2011 11:44:35 -0800 Subject: audio: moved the grc audio blocks into gr-audio dir --- config/grc_gr_audio.m4 | 1 + 1 file changed, 1 insertion(+) (limited to 'config/grc_gr_audio.m4') diff --git a/config/grc_gr_audio.m4 b/config/grc_gr_audio.m4 index 9ca03a045..15f4d4eb6 100644 --- a/config/grc_gr_audio.m4 +++ b/config/grc_gr_audio.m4 @@ -28,6 +28,7 @@ AC_DEFUN([GRC_GR_AUDIO],[ AC_CONFIG_FILES([ \ gr-audio/Makefile \ + gr-audio/grc/Makefile \ gr-audio/include/Makefile \ gr-audio/lib/Makefile \ gr-audio/swig/Makefile \ -- cgit From 8bd65a04463692e6f179a5fc4f23d73782103781 Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Wed, 9 Mar 2011 12:51:53 -0800 Subject: audio: added oss support to gr-audio --- config/grc_gr_audio.m4 | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) (limited to 'config/grc_gr_audio.m4') diff --git a/config/grc_gr_audio.m4 b/config/grc_gr_audio.m4 index 15f4d4eb6..05116b138 100644 --- a/config/grc_gr_audio.m4 +++ b/config/grc_gr_audio.m4 @@ -23,9 +23,42 @@ AC_DEFUN([GRC_GR_AUDIO],[ dnl Don't do gr-audio-alsa if gnuradio-core skipped GRC_CHECK_DEPENDENCY(gr-audio, gnuradio-core) - PKG_CHECK_MODULES(ALSA, alsa >= 0.9,[GR_AUDIO_ALSA_SUPPORT=true],[GR_AUDIO_ALSA_SUPPORT=false]) + #################################################################### + ## ALSA Support + #################################################################### + GR_AUDIO_ALSA_SUPPORT=true + dnl Don't do gr-audio-alsa if the 'alsa' package is not installed. + PKG_CHECK_MODULES(ALSA, alsa >= 0.9,[], + [GR_AUDIO_ALSA_SUPPORT=false;AC_MSG_RESULT([gr-audio alsa support requires package alsa, not found.])]) AM_CONDITIONAL(GR_AUDIO_ALSA_SUPPORT, $GR_AUDIO_ALSA_SUPPORT) + #################################################################### + ## OSS Support + #################################################################### + dnl Make sure the correct library and/or headers are available. + GR_AUDIO_OSS_SUPPORT=true + case $host_os in + netbsd*) + AC_HAVE_LIBRARY(ossaudio,[], + [GR_AUDIO_OSS_SUPPORT=false;AC_MSG_RESULT([gr-audio oss support requires library ossaudio, not found.])]) + if test $GR_AUDIO_OSS_SUPPORT != false; then + OSS_LIBS=-lossaudio + AC_SUBST(OSS_LIBS) + AC_MSG_RESULT([Using OSS library $OSS_LIBS]) + fi + ;; + darwin*) + dnl OSX / Darwin can't use OSS + GR_AUDIO_OSS_SUPPORT=false + ;; + *) + AC_CHECK_HEADER(sys/soundcard.h,[], + [GR_AUDIO_OSS_SUPPORT=false;AC_MSG_RESULT([gr-audio oss support requires sys/soundcard.h, not found.])]) + esac + AM_CONDITIONAL(GR_AUDIO_OSS_SUPPORT, $GR_AUDIO_OSS_SUPPORT) + + + AC_CONFIG_FILES([ \ gr-audio/Makefile \ gr-audio/grc/Makefile \ -- cgit From ef276a8ba31f920ac469b84466338e8693e43a2e Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Wed, 9 Mar 2011 16:10:31 -0800 Subject: audio: added config checks for other audios, added jack and port --- config/grc_gr_audio.m4 | 54 +++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 47 insertions(+), 7 deletions(-) (limited to 'config/grc_gr_audio.m4') diff --git a/config/grc_gr_audio.m4 b/config/grc_gr_audio.m4 index 05116b138..bcb19be35 100644 --- a/config/grc_gr_audio.m4 +++ b/config/grc_gr_audio.m4 @@ -20,15 +20,12 @@ 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) #################################################################### ## ALSA Support #################################################################### - GR_AUDIO_ALSA_SUPPORT=true - dnl Don't do gr-audio-alsa if the 'alsa' package is not installed. - PKG_CHECK_MODULES(ALSA, alsa >= 0.9,[], + PKG_CHECK_MODULES(ALSA, alsa >= 0.9,[GR_AUDIO_ALSA_SUPPORT=true], [GR_AUDIO_ALSA_SUPPORT=false;AC_MSG_RESULT([gr-audio alsa support requires package alsa, not found.])]) AM_CONDITIONAL(GR_AUDIO_ALSA_SUPPORT, $GR_AUDIO_ALSA_SUPPORT) @@ -36,10 +33,9 @@ AC_DEFUN([GRC_GR_AUDIO],[ ## OSS Support #################################################################### dnl Make sure the correct library and/or headers are available. - GR_AUDIO_OSS_SUPPORT=true case $host_os in netbsd*) - AC_HAVE_LIBRARY(ossaudio,[], + AC_HAVE_LIBRARY(ossaudio,[GR_AUDIO_OSS_SUPPORT=true], [GR_AUDIO_OSS_SUPPORT=false;AC_MSG_RESULT([gr-audio oss support requires library ossaudio, not found.])]) if test $GR_AUDIO_OSS_SUPPORT != false; then OSS_LIBS=-lossaudio @@ -52,12 +48,56 @@ AC_DEFUN([GRC_GR_AUDIO],[ GR_AUDIO_OSS_SUPPORT=false ;; *) - AC_CHECK_HEADER(sys/soundcard.h,[], + AC_CHECK_HEADER(sys/soundcard.h,[GR_AUDIO_OSS_SUPPORT=true], [GR_AUDIO_OSS_SUPPORT=false;AC_MSG_RESULT([gr-audio oss support requires sys/soundcard.h, not found.])]) esac AM_CONDITIONAL(GR_AUDIO_OSS_SUPPORT, $GR_AUDIO_OSS_SUPPORT) + #################################################################### + ## Jack Support + #################################################################### + PKG_CHECK_MODULES(JACK, jack >= 0.8, [GR_AUDIO_JACK_SUPPORT=true], + [GR_AUDIO_JACK_SUPPORT=false;AC_MSG_RESULT([gr-audio jack support requires package jack, not found.])]) + AM_CONDITIONAL(GR_AUDIO_JACK_SUPPORT, $GR_AUDIO_JACK_SUPPORT) + + #################################################################### + ## OSX Support + #################################################################### + case "$host_os" in + darwin*) + MACOSX_AUDIOUNIT([GR_AUDIO_OSX_SUPPORT=true], + [GR_AUDIO_OSX_SUPPORT=false;AC_MSG_RESULT([gr-audio osx support requires AudioUnit, not found.])]) + ;; + *) + AC_MSG_RESULT([gr-audio osx support will build on Mac OS X and Darwin only.]) + GR_AUDIO_OSX_SUPPORT=false + ;; + esac + AM_CONDITIONAL(GR_AUDIO_OSX_SUPPORT, $GR_AUDIO_OSX_SUPPORT) + #################################################################### + ## PortAudio Support + #################################################################### + PKG_CHECK_MODULES(PORTAUDIO, portaudio-2.0 >= 19,[GR_AUDIO_PORTAUDIO_SUPPORT=true], + [GR_AUDIO_PORTAUDIO_SUPPORT=false;AC_MSG_RESULT([gr-audio portaudio support requires package portaudio, not found.])]) + AM_CONDITIONAL(GR_AUDIO_PORTAUDIO_SUPPORT, $GR_AUDIO_PORTAUDIO_SUPPORT) + + #################################################################### + ## Windows Support + #################################################################### + case "$host_os" in + cygwin*|win*|mingw*) + AC_HAVE_LIBRARY(winmm, [GR_AUDIO_WINDOWS_SUPPORT=true], + [GR_AUDIO_WINDOWS_SUPPORT=false;AC_MSG_RESULT([gr-audio windows support requires library winmm, not found.])]) + ;; + *) + AC_MSG_RESULT([gr-audio windows support will build on a Windows Unix environment only.]) + GR_AUDIO_WINDOWS_SUPPORT=false + ;; + esac + WINAUDIO_LIBS=-lwinmm + AC_SUBST(WINAUDIO_LIBS) + AM_CONDITIONAL(GR_AUDIO_WINDOWS_SUPPORT, $GR_AUDIO_WINDOWS_SUPPORT) AC_CONFIG_FILES([ \ gr-audio/Makefile \ -- cgit