diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2013-02-11 15:16:56 -0500 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2013-02-11 15:16:56 -0500 |
| commit | d28b2f2bdd4a2961bb29076085a129299aeec157 (patch) | |
| tree | 3d44681286bf35c04b2fdadefb8ea5fa7b773a75 | |
| parent | af91dffb6f2c7acdd07f1ba40933accb3c535431 (diff) | |
audio: wip: moving audio to 3.7 style. Headers renamed and moved.
22 files changed, 45 insertions, 45 deletions
diff --git a/gr-audio/CMakeLists.txt b/gr-audio/CMakeLists.txt index 7c0d7b393a..1da6635ec0 100644 --- a/gr-audio/CMakeLists.txt +++ b/gr-audio/CMakeLists.txt @@ -86,7 +86,7 @@ CPACK_COMPONENT("audio_swig" ######################################################################## # Add subdirectories ######################################################################## -add_subdirectory(include) +add_subdirectory(include/audio) add_subdirectory(lib) add_subdirectory(doc) if(ENABLE_PYTHON) diff --git a/gr-audio/examples/c++/dial_tone.cc b/gr-audio/examples/c++/dial_tone.cc index 801ff35f2e..924e7953f1 100644 --- a/gr-audio/examples/c++/dial_tone.cc +++ b/gr-audio/examples/c++/dial_tone.cc @@ -1,5 +1,5 @@ /* - * Copyright 2011 Free Software Foundation, Inc. + * Copyright 2011,2013 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -39,7 +39,7 @@ // Include header files for each block used in flowgraph #include <gr_top_block.h> #include <analog/sig_source_f.h> -#include <gr_audio_sink.h> +#include <audio/sink.h> using namespace gr; diff --git a/gr-audio/include/CMakeLists.txt b/gr-audio/include/audio/CMakeLists.txt index a415063734..1cfbb9bfa2 100644 --- a/gr-audio/include/CMakeLists.txt +++ b/gr-audio/include/audio/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright 2011 Free Software Foundation, Inc. +# Copyright 2011,2013 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -21,9 +21,9 @@ # Install header files ######################################################################## install(FILES - gr_audio_api.h - gr_audio_source.h - gr_audio_sink.h - DESTINATION ${GR_INCLUDE_DIR}/gnuradio + api.h + source.h + sink.h + DESTINATION ${GR_INCLUDE_DIR}/gnuradio/audio COMPONENT "audio_devel" ) diff --git a/gr-audio/include/gr_audio_api.h b/gr-audio/include/audio/api.h index 2ddd0fec6e..2ddd0fec6e 100644 --- a/gr-audio/include/gr_audio_api.h +++ b/gr-audio/include/audio/api.h diff --git a/gr-audio/include/gr_audio_sink.h b/gr-audio/include/audio/sink.h index c2c8bdc308..a66db7b0f4 100644 --- a/gr-audio/include/gr_audio_sink.h +++ b/gr-audio/include/audio/sink.h @@ -1,5 +1,5 @@ /* - * Copyright 2011 Free Software Foundation, Inc. + * Copyright 2011,2013 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -22,7 +22,7 @@ #ifndef INCLUDED_GR_AUDIO_SINK_H #define INCLUDED_GR_AUDIO_SINK_H -#include <gr_audio_api.h> +#include <audio/api.h> #include <gr_sync_block.h> /*! diff --git a/gr-audio/include/gr_audio_source.h b/gr-audio/include/audio/source.h index 0e46ab1980..e920c5143e 100644 --- a/gr-audio/include/gr_audio_source.h +++ b/gr-audio/include/audio/source.h @@ -1,5 +1,5 @@ /* - * Copyright 2011 Free Software Foundation, Inc. + * Copyright 2011,2013 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -22,7 +22,7 @@ #ifndef INCLUDED_GR_AUDIO_SOURCE_H #define INCLUDED_GR_AUDIO_SOURCE_H -#include <gr_audio_api.h> +#include <audio/api.h> #include <gr_sync_block.h> /*! diff --git a/gr-audio/lib/alsa/audio_alsa_sink.h b/gr-audio/lib/alsa/audio_alsa_sink.h index d456e53de3..979a00c8f8 100644 --- a/gr-audio/lib/alsa/audio_alsa_sink.h +++ b/gr-audio/lib/alsa/audio_alsa_sink.h @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2004-2011 Free Software Foundation, Inc. + * Copyright 2004-2011,2013 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -27,7 +27,7 @@ #define ALSA_PCM_NEW_HW_PARAMS_API #define ALSA_PCM_NEW_SW_PARAMS_API -#include <gr_audio_sink.h> +#include <audio/sink.h> #include <string> #include <alsa/asoundlib.h> #include <stdexcept> diff --git a/gr-audio/lib/alsa/audio_alsa_source.h b/gr-audio/lib/alsa/audio_alsa_source.h index 320d49bd28..fd33fd89ad 100644 --- a/gr-audio/lib/alsa/audio_alsa_source.h +++ b/gr-audio/lib/alsa/audio_alsa_source.h @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2004-2011 Free Software Foundation, Inc. + * Copyright 2004-2011,2013 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -27,7 +27,7 @@ #define ALSA_PCM_NEW_HW_PARAMS_API #define ALSA_PCM_NEW_SW_PARAMS_API -#include <gr_audio_source.h> +#include <audio/source.h> #include <string> #include <alsa/asoundlib.h> #include <stdexcept> diff --git a/gr-audio/lib/gr_audio_registry.h b/gr-audio/lib/gr_audio_registry.h index c40e156579..59a4c0fa67 100644 --- a/gr-audio/lib/gr_audio_registry.h +++ b/gr-audio/lib/gr_audio_registry.h @@ -22,8 +22,8 @@ #ifndef INCLUDED_GR_AUDIO_REGISTRY_H #define INCLUDED_GR_AUDIO_REGISTRY_H -#include <gr_audio_sink.h> -#include <gr_audio_source.h> +#include <audio/sink.h> +#include <audio/source.h> #include <string> typedef audio_source::sptr(*source_factory_t)(int, const std::string &, bool); diff --git a/gr-audio/lib/jack/audio_jack_sink.h b/gr-audio/lib/jack/audio_jack_sink.h index 8cc3439370..ac6c770b54 100644 --- a/gr-audio/lib/jack/audio_jack_sink.h +++ b/gr-audio/lib/jack/audio_jack_sink.h @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2005-2011 Free Software Foundation, Inc. + * Copyright 2005-2011,2013 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -22,7 +22,7 @@ #ifndef INCLUDED_AUDIO_JACK_SINK_H #define INCLUDED_AUDIO_JACK_SINK_H -#include <gr_audio_sink.h> +#include <audio/sink.h> #include <string> #include <jack/jack.h> #include <jack/ringbuffer.h> diff --git a/gr-audio/lib/jack/audio_jack_source.h b/gr-audio/lib/jack/audio_jack_source.h index 2849c84b0c..5b893a3d34 100644 --- a/gr-audio/lib/jack/audio_jack_source.h +++ b/gr-audio/lib/jack/audio_jack_source.h @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2005-2011 Free Software Foundation, Inc. + * Copyright 2005-2011,2013 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -22,7 +22,7 @@ #ifndef INCLUDED_AUDIO_JACK_SOURCE_H #define INCLUDED_AUDIO_JACK_SOURCE_H -#include <gr_audio_source.h> +#include <audio/source.h> #include <string> #include <jack/jack.h> #include <jack/ringbuffer.h> diff --git a/gr-audio/lib/oss/audio_oss_sink.h b/gr-audio/lib/oss/audio_oss_sink.h index 8148ec34b8..8f516f8d73 100644 --- a/gr-audio/lib/oss/audio_oss_sink.h +++ b/gr-audio/lib/oss/audio_oss_sink.h @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2004-2011 Free Software Foundation, Inc. + * Copyright 2004-2011,2013 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -23,7 +23,7 @@ #ifndef INCLUDED_AUDIO_OSS_SINK_H #define INCLUDED_AUDIO_OSS_SINK_H -#include <gr_audio_sink.h> +#include <audio/sink.h> #include <string> /*! diff --git a/gr-audio/lib/oss/audio_oss_source.h b/gr-audio/lib/oss/audio_oss_source.h index abb2db1f8b..27739c5f44 100644 --- a/gr-audio/lib/oss/audio_oss_source.h +++ b/gr-audio/lib/oss/audio_oss_source.h @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2004-2011 Free Software Foundation, Inc. + * Copyright 2004-2011,2013 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -23,7 +23,7 @@ #ifndef INCLUDED_AUDIO_OSS_SOURCE_H #define INCLUDED_AUDIO_OSS_SOURCE_H -#include <gr_audio_source.h> +#include <audio/source.h> #include <string> /*! diff --git a/gr-audio/lib/osx/audio_osx_sink.h b/gr-audio/lib/osx/audio_osx_sink.h index 73b3db40d6..0422e6f4b7 100644 --- a/gr-audio/lib/osx/audio_osx_sink.h +++ b/gr-audio/lib/osx/audio_osx_sink.h @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2006-2011 Free Software Foundation, Inc. + * Copyright 2006-2011,2013 Free Software Foundation, Inc. * * This file is part of GNU Radio. * @@ -23,7 +23,7 @@ #ifndef INCLUDED_AUDIO_OSX_SINK_H #define INCLUDED_AUDIO_OSX_SINK_H -#include <gr_audio_sink.h> +#include <audio/sink.h> #include <string> #include <list> #include <AudioUnit/AudioUnit.h> diff --git a/gr-audio/lib/osx/audio_osx_source.h b/gr-audio/lib/osx/audio_osx_source.h index bb34d972cd..f4a72f66fc 100644 --- a/gr-audio/lib/osx/audio_osx_source.h +++ b/gr-audio/lib/osx/audio_osx_source.h @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2006-2011 Free Software Foundation, Inc. + * Copyright 2006-2011,2013 Free Software Foundation, Inc. * * This file is part of GNU Radio. * @@ -23,7 +23,7 @@ #ifndef INCLUDED_AUDIO_OSX_SOURCE_H #define INCLUDED_AUDIO_OSX_SOURCE_H -#include <gr_audio_source.h> +#include <audio/source.h> #include <string> #include <AudioToolbox/AudioToolbox.h> #include <AudioUnit/AudioUnit.h> diff --git a/gr-audio/lib/portaudio/audio_portaudio_sink.h b/gr-audio/lib/portaudio/audio_portaudio_sink.h index cf64d3da04..4b21560d6c 100644 --- a/gr-audio/lib/portaudio/audio_portaudio_sink.h +++ b/gr-audio/lib/portaudio/audio_portaudio_sink.h @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2006-2011 Free Software Foundation, Inc. + * Copyright 2006-2011,2013 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -22,7 +22,7 @@ #ifndef INCLUDED_AUDIO_PORTAUDIO_SINK_H #define INCLUDED_AUDIO_PORTAUDIO_SINK_H -#include <gr_audio_sink.h> +#include <audio/sink.h> #include <gr_buffer.h> #include <gruel/thread.h> #include <string> diff --git a/gr-audio/lib/portaudio/audio_portaudio_source.h b/gr-audio/lib/portaudio/audio_portaudio_source.h index e81389a3b8..67a83f1fe5 100644 --- a/gr-audio/lib/portaudio/audio_portaudio_source.h +++ b/gr-audio/lib/portaudio/audio_portaudio_source.h @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2006-2011 Free Software Foundation, Inc. + * Copyright 2006-2011,2013 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -22,7 +22,7 @@ #ifndef INCLUDED_AUDIO_PORTAUDIO_SOURCE_H #define INCLUDED_AUDIO_PORTAUDIO_SOURCE_H -#include <gr_audio_source.h> +#include <audio/source.h> #include <gr_buffer.h> #include <gruel/thread.h> #include <string> diff --git a/gr-audio/lib/windows/audio_windows_sink.h b/gr-audio/lib/windows/audio_windows_sink.h index d4ca259b3b..1628ee73a0 100644 --- a/gr-audio/lib/windows/audio_windows_sink.h +++ b/gr-audio/lib/windows/audio_windows_sink.h @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2004-2011 Free Software Foundation, Inc. + * Copyright 2004-2011,2013 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -29,7 +29,7 @@ #include <windows.h> #include <mmsystem.h> -#include <gr_audio_sink.h> +#include <audio/sink.h> #include <string> /*! diff --git a/gr-audio/lib/windows/audio_windows_source.h b/gr-audio/lib/windows/audio_windows_source.h index 9cb7895760..acf6971c07 100644 --- a/gr-audio/lib/windows/audio_windows_source.h +++ b/gr-audio/lib/windows/audio_windows_source.h @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2004-2011 Free Software Foundation, Inc. + * Copyright 2004-2011,2013 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -23,7 +23,7 @@ #ifndef INCLUDED_AUDIO_WINDOWS_SOURCE_H #define INCLUDED_AUDIO_WINDOWS_SOURCE_H -#include <gr_audio_source.h> +#include <audio/source.h> #include <string> /*! diff --git a/gr-audio/swig/audio_swig.i b/gr-audio/swig/audio_swig.i index 089055dac4..6e5ca6c00a 100644 --- a/gr-audio/swig/audio_swig.i +++ b/gr-audio/swig/audio_swig.i @@ -1,5 +1,5 @@ /* - * Copyright 2011 Free Software Foundation, Inc. + * Copyright 2011,2013 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -34,15 +34,15 @@ // block headers //////////////////////////////////////////////////////////////////////// %{ -#include <gr_audio_source.h> -#include <gr_audio_sink.h> +#include <audio/source.h> +#include <audio/sink.h> %} //////////////////////////////////////////////////////////////////////// // block magic //////////////////////////////////////////////////////////////////////// GR_SWIG_BLOCK_MAGIC(audio,source) -%include <gr_audio_source.h> +%include <audio/source.h> GR_SWIG_BLOCK_MAGIC(audio,sink) -%include <gr_audio_sink.h> +%include <audio/sink.h> diff --git a/gr-fcd/examples/c++/fcd_nfm_rx.cc b/gr-fcd/examples/c++/fcd_nfm_rx.cc index a0eee134d0..5f969b908b 100644 --- a/gr-fcd/examples/c++/fcd_nfm_rx.cc +++ b/gr-fcd/examples/c++/fcd_nfm_rx.cc @@ -36,7 +36,7 @@ #include <filter/firdes.h> #include <filter/fir_filter_ccf.h> #include <analog/quadrature_demod_cf.h> -#include <gr_audio_sink.h> +#include <audio/sink.h> #include <fcd_source_c.h> // other includes diff --git a/gr-fcd/lib/fcd_source_c_impl.h b/gr-fcd/lib/fcd_source_c_impl.h index d4ac404170..378bc4ee2e 100644 --- a/gr-fcd/lib/fcd_source_c_impl.h +++ b/gr-fcd/lib/fcd_source_c_impl.h @@ -22,7 +22,7 @@ #define INCLUDED_FCD_SOURCE_C_IMPL_H #include <fcd_source_c.h> -#include <gr_audio_source.h> +#include <audio/source.h> class FCD_API fcd_source_c_impl : public fcd_source_c { |