diff options
| -rw-r--r-- | config/grc_gr_audio.m4 | 1 | ||||
| -rw-r--r-- | gr-audio/Makefile.am | 2 | ||||
| -rw-r--r-- | gr-audio/grc/.gitignore | 2 | ||||
| -rw-r--r-- | gr-audio/grc/Makefile.am | 29 | ||||
| -rw-r--r-- | gr-audio/grc/audio_sink.xml (renamed from grc/blocks/audio_sink.xml) | 3 | ||||
| -rw-r--r-- | gr-audio/grc/audio_source.xml (renamed from grc/blocks/audio_source.xml) | 3 | ||||
| -rw-r--r-- | grc/blocks/Makefile.am | 2 | ||||
| -rw-r--r-- | grc/blocks/block_tree.xml | 2 |
8 files changed, 37 insertions, 7 deletions
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 \ diff --git a/gr-audio/Makefile.am b/gr-audio/Makefile.am index 33d2946ba..bb0d05d07 100644 --- a/gr-audio/Makefile.am +++ b/gr-audio/Makefile.am @@ -24,7 +24,7 @@ include $(top_srcdir)/Makefile.common SUBDIRS = include lib if PYTHON -SUBDIRS += swig +SUBDIRS += grc swig endif pkgconfigdir = $(libdir)/pkgconfig diff --git a/gr-audio/grc/.gitignore b/gr-audio/grc/.gitignore new file mode 100644 index 000000000..b336cc7ce --- /dev/null +++ b/gr-audio/grc/.gitignore @@ -0,0 +1,2 @@ +/Makefile +/Makefile.in diff --git a/gr-audio/grc/Makefile.am b/gr-audio/grc/Makefile.am new file mode 100644 index 000000000..36d9daa7a --- /dev/null +++ b/gr-audio/grc/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 + +grcblocksdir = $(grc_blocksdir) + +dist_grcblocks_DATA = \ + audio_source.xml \ + audio_sink.xml + diff --git a/grc/blocks/audio_sink.xml b/gr-audio/grc/audio_sink.xml index 75d583470..26e199d61 100644 --- a/grc/blocks/audio_sink.xml +++ b/gr-audio/grc/audio_sink.xml @@ -7,12 +7,13 @@ <block> <name>Audio Sink</name> <key>audio_sink</key> + <category>Sinks</category> <import>from gnuradio import audio</import> <make>audio.sink($samp_rate, $device_name, $ok_to_block)</make> <param> <name>Sample Rate</name> <key>samp_rate</key> - <value>32000</value> + <value>samp_rate</value> <type>int</type> <option> <name>16KHz</name> diff --git a/grc/blocks/audio_source.xml b/gr-audio/grc/audio_source.xml index 1f5d1033e..59b375244 100644 --- a/grc/blocks/audio_source.xml +++ b/gr-audio/grc/audio_source.xml @@ -7,12 +7,13 @@ <block> <name>Audio Source</name> <key>audio_source</key> + <category>Sources</category> <import>from gnuradio import audio</import> <make>audio.source($samp_rate, $device_name, $ok_to_block)</make> <param> <name>Sample Rate</name> <key>samp_rate</key> - <value>32000</value> + <value>samp_rate</value> <type>int</type> <option> <name>16KHz</name> diff --git a/grc/blocks/Makefile.am b/grc/blocks/Makefile.am index 18420a013..c218a59c2 100644 --- a/grc/blocks/Makefile.am +++ b/grc/blocks/Makefile.am @@ -24,8 +24,6 @@ include $(top_srcdir)/Makefile.common ourdatadir = $(grc_blocksdir) dist_ourdata_DATA = \ block_tree.xml \ - audio_sink.xml \ - audio_source.xml \ band_pass_filter.xml \ band_reject_filter.xml \ blks2_am_demod_cf.xml \ diff --git a/grc/blocks/block_tree.xml b/grc/blocks/block_tree.xml index 610a88102..82b9e58f3 100644 --- a/grc/blocks/block_tree.xml +++ b/grc/blocks/block_tree.xml @@ -18,7 +18,6 @@ <block>gr_file_source</block> <block>blks2_tcp_source</block> <block>gr_udp_source</block> - <block>audio_source</block> <block>gr_wavfile_source</block> <block>gr_message_source</block> <block>pad_source</block> @@ -32,7 +31,6 @@ <block>gr_file_sink</block> <block>blks2_tcp_sink</block> <block>gr_udp_sink</block> - <block>audio_sink</block> <block>gr_wavfile_sink</block> <block>gr_message_sink</block> <block>pad_sink</block> |