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 --- gr-audio/lib/Makefile.am | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 gr-audio/lib/Makefile.am (limited to 'gr-audio/lib/Makefile.am') 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 -- cgit From 77da72f511647d458b62ffefaa94662b78d7f7d3 Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Wed, 9 Mar 2011 00:52:55 -0800 Subject: audio: added audio factory registry and top level includes --- gr-audio/lib/Makefile.am | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'gr-audio/lib/Makefile.am') diff --git a/gr-audio/lib/Makefile.am b/gr-audio/lib/Makefile.am index d5b319c36..8e5915ba2 100644 --- a/gr-audio/lib/Makefile.am +++ b/gr-audio/lib/Makefile.am @@ -20,3 +20,21 @@ # include $(top_srcdir)/Makefile.common + +AM_CPPFLAGS = \ + $(STD_DEFINES_AND_INCLUDES) \ + $(WITH_INCLUDES) \ + -I$(abs_top_srcdir)/gr-audio/include \ + -Dgnuradio_audio_EXPORTS + +lib_LTLIBRARIES = libgnuradio-audio.la + +libgnuradio_audio_la_SOURCES = \ + gr_audio_registry.cc + +libgnuradio_audio_la_LIBADD = \ + $(GNURADIO_CORE_LA) + +libgnuradio_audio_la_LDFLAGS = $(LTVERSIONFLAGS) + +noinst_HEADERS = gr_audio_registry.h -- 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 --- gr-audio/lib/Makefile.am | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gr-audio/lib/Makefile.am') diff --git a/gr-audio/lib/Makefile.am b/gr-audio/lib/Makefile.am index 8e5915ba2..7d9e419a8 100644 --- a/gr-audio/lib/Makefile.am +++ b/gr-audio/lib/Makefile.am @@ -38,3 +38,29 @@ libgnuradio_audio_la_LIBADD = \ libgnuradio_audio_la_LDFLAGS = $(LTVERSIONFLAGS) noinst_HEADERS = gr_audio_registry.h + +etcdir = $(gr_prefsdir) +dist_etc_DATA = gr-audio.conf + +######################################################################## +## ALSA Support +######################################################################## +if GR_AUDIO_ALSA_SUPPORT + +AM_CPPFLAGS += $(ALSA_CPPFLAGS) + +libgnuradio_audio_la_LIBADD += $(ALSA_LIBS) + +libgnuradio_audio_la_SOURCES += \ + gri_alsa.cc \ + audio_alsa_source.cc \ + audio_alsa_sink.cc + +noinst_HEADERS += \ + gri_alsa.h \ + audio_alsa_source.h \ + audio_alsa_sink.h + +dist_etc_DATA += gr-audio-alsa.conf + +endif -- cgit From 6d1d64ebacc156f4df5401dac427b316dd22265d Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Wed, 9 Mar 2011 11:28:09 -0800 Subject: audio: moved alsa support files into subdirectory --- gr-audio/lib/Makefile.am | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'gr-audio/lib/Makefile.am') diff --git a/gr-audio/lib/Makefile.am b/gr-audio/lib/Makefile.am index 7d9e419a8..995cfec88 100644 --- a/gr-audio/lib/Makefile.am +++ b/gr-audio/lib/Makefile.am @@ -47,20 +47,22 @@ dist_etc_DATA = gr-audio.conf ######################################################################## if GR_AUDIO_ALSA_SUPPORT -AM_CPPFLAGS += $(ALSA_CPPFLAGS) +AM_CPPFLAGS += \ + -I$(srcdir)/alsa \ + $(ALSA_CPPFLAGS) libgnuradio_audio_la_LIBADD += $(ALSA_LIBS) libgnuradio_audio_la_SOURCES += \ - gri_alsa.cc \ - audio_alsa_source.cc \ - audio_alsa_sink.cc + alsa/gri_alsa.cc \ + alsa/audio_alsa_source.cc \ + alsa/audio_alsa_sink.cc noinst_HEADERS += \ - gri_alsa.h \ - audio_alsa_source.h \ - audio_alsa_sink.h + alsa/gri_alsa.h \ + alsa/audio_alsa_source.h \ + alsa/audio_alsa_sink.h -dist_etc_DATA += gr-audio-alsa.conf +dist_etc_DATA += alsa/gr-audio-alsa.conf endif -- 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 --- gr-audio/lib/Makefile.am | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gr-audio/lib/Makefile.am') diff --git a/gr-audio/lib/Makefile.am b/gr-audio/lib/Makefile.am index 995cfec88..6cbaf2679 100644 --- a/gr-audio/lib/Makefile.am +++ b/gr-audio/lib/Makefile.am @@ -66,3 +66,26 @@ noinst_HEADERS += \ dist_etc_DATA += alsa/gr-audio-alsa.conf endif + +######################################################################## +## OSS Support +######################################################################## +if GR_AUDIO_OSS_SUPPORT + +AM_CPPFLAGS += \ + -I$(srcdir)/oss \ + $(OSS_CPPFLAGS) + +libgnuradio_audio_la_LIBADD += $(OSS_LIBS) + +libgnuradio_audio_la_SOURCES += \ + oss/audio_oss_source.cc \ + oss/audio_oss_sink.cc + +noinst_HEADERS += \ + oss/audio_oss_source.h \ + oss/audio_oss_sink.h + +dist_etc_DATA += oss/gr-audio-oss.conf + +endif -- 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 --- gr-audio/lib/Makefile.am | 95 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 93 insertions(+), 2 deletions(-) (limited to 'gr-audio/lib/Makefile.am') diff --git a/gr-audio/lib/Makefile.am b/gr-audio/lib/Makefile.am index 6cbaf2679..9972efadc 100644 --- a/gr-audio/lib/Makefile.am +++ b/gr-audio/lib/Makefile.am @@ -73,8 +73,7 @@ endif if GR_AUDIO_OSS_SUPPORT AM_CPPFLAGS += \ - -I$(srcdir)/oss \ - $(OSS_CPPFLAGS) + -I$(srcdir)/oss libgnuradio_audio_la_LIBADD += $(OSS_LIBS) @@ -89,3 +88,95 @@ noinst_HEADERS += \ dist_etc_DATA += oss/gr-audio-oss.conf endif + +######################################################################## +## Jack Support +######################################################################## +if GR_AUDIO_JACK_SUPPORT + +AM_CPPFLAGS += \ + -I$(srcdir)/jack \ + $(JACK_CPPFLAGS) + +libgnuradio_audio_la_LIBADD += $(JACK_LIBS) + +libgnuradio_audio_la_SOURCES += \ + jack/gri_jack.cc \ + jack/audio_jack_source.cc \ + jack/audio_jack_sink.cc + +noinst_HEADERS += \ + jack/gri_jack.h \ + jack/audio_jack_source.h \ + jack/audio_jack_sink.h + +dist_etc_DATA += jack/gr-audio-jack.conf + +endif + +######################################################################## +## OSX Support +######################################################################## +if GR_AUDIO_OSX_SUPPORT + +AM_CPPFLAGS += \ + -I$(srcdir)/osx + +libgnuradio_audio_la_SOURCES += \ + osx/audio_osx_source.cc \ + osx/audio_osx_sink.cc + +noinst_HEADERS += \ + osx/audio_osx_source.h \ + osx/audio_osx_sink.h + +dist_etc_DATA += osx/gr-audio-osx.conf + +endif + +######################################################################## +## PortAudio Support +######################################################################## +if GR_AUDIO_PORTAUDIO_SUPPORT + +AM_CPPFLAGS += \ + -I$(srcdir)/portaudio \ + $(PORTAUDIO_CPPFLAGS) + +libgnuradio_audio_la_LIBADD += $(PORTAUDIO_LIBS) + +libgnuradio_audio_la_SOURCES += \ + portaudio/gri_portaudio.cc \ + portaudio/audio_portaudio_source.cc \ + portaudio/audio_portaudio_sink.cc + +noinst_HEADERS += \ + portaudio/gri_portaudio.h \ + portaudio/audio_portaudio_source.h \ + portaudio/audio_portaudio_sink.h + +dist_etc_DATA += portaudio/gr-audio-portaudio.conf + +endif + +######################################################################## +## Windows Support +######################################################################## +if GR_AUDIO_WINDOWS_SUPPORT + +AM_CPPFLAGS += \ + -I$(srcdir)/windows + +libgnuradio_audio_la_LIBADD += $(WINAUDIO_LIBS) + +libgnuradio_audio_la_SOURCES += \ + windows/audio_windows_source.cc \ + windows/audio_windows_sink.cc + +noinst_HEADERS += \ + windows/audio_windows_source.h \ + windows/audio_windows_sink.h + +dist_etc_DATA += windows/gr-audio-windows.conf + +endif -- cgit From 5f4976ea2701d6f3ebe35eef7cc939f98a28ec88 Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Wed, 9 Mar 2011 16:27:43 -0800 Subject: audio: added windows and osx audio source files --- gr-audio/lib/Makefile.am | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'gr-audio/lib/Makefile.am') diff --git a/gr-audio/lib/Makefile.am b/gr-audio/lib/Makefile.am index 9972efadc..42a2b867b 100644 --- a/gr-audio/lib/Makefile.am +++ b/gr-audio/lib/Makefile.am @@ -127,11 +127,10 @@ libgnuradio_audio_la_SOURCES += \ osx/audio_osx_sink.cc noinst_HEADERS += \ + osx/audio_osx.h \ osx/audio_osx_source.h \ osx/audio_osx_sink.h -dist_etc_DATA += osx/gr-audio-osx.conf - endif ######################################################################## @@ -177,6 +176,4 @@ noinst_HEADERS += \ windows/audio_windows_source.h \ windows/audio_windows_sink.h -dist_etc_DATA += windows/gr-audio-windows.conf - endif -- cgit From 113a144a09f7620bc7a3bf03eda23c7bdc1b19f6 Mon Sep 17 00:00:00 2001 From: Tom Rondeau Date: Mon, 28 Mar 2011 16:34:36 -0400 Subject: audio: added missing header to Makefile. --- gr-audio/lib/Makefile.am | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gr-audio/lib/Makefile.am') diff --git a/gr-audio/lib/Makefile.am b/gr-audio/lib/Makefile.am index 42a2b867b..3ddfbd1fc 100644 --- a/gr-audio/lib/Makefile.am +++ b/gr-audio/lib/Makefile.am @@ -129,7 +129,8 @@ libgnuradio_audio_la_SOURCES += \ noinst_HEADERS += \ osx/audio_osx.h \ osx/audio_osx_source.h \ - osx/audio_osx_sink.h + osx/audio_osx_sink.h \ + osx/circular_buffer.h endif -- cgit From 9166da7a6250da1026d19c4220a7a7244d4b06cf Mon Sep 17 00:00:00 2001 From: Don Ward Date: Wed, 30 Mar 2011 16:34:34 -0700 Subject: build: add missing linker defines for Win32 --- gr-audio/lib/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gr-audio/lib/Makefile.am') diff --git a/gr-audio/lib/Makefile.am b/gr-audio/lib/Makefile.am index 3ddfbd1fc..2bec73ff0 100644 --- a/gr-audio/lib/Makefile.am +++ b/gr-audio/lib/Makefile.am @@ -35,7 +35,7 @@ libgnuradio_audio_la_SOURCES = \ libgnuradio_audio_la_LIBADD = \ $(GNURADIO_CORE_LA) -libgnuradio_audio_la_LDFLAGS = $(LTVERSIONFLAGS) +libgnuradio_audio_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS) noinst_HEADERS = gr_audio_registry.h -- cgit