diff options
Diffstat (limited to 'gr-audio/lib')
27 files changed, 111 insertions, 111 deletions
diff --git a/gr-audio/lib/alsa/alsa_sink.cc b/gr-audio/lib/alsa/alsa_sink.cc index 4af57105a9..fa77933669 100644 --- a/gr-audio/lib/alsa/alsa_sink.cc +++ b/gr-audio/lib/alsa/alsa_sink.cc @@ -27,8 +27,8 @@ #include "audio_registry.h" #include <alsa_sink.h> #include <alsa_impl.h> -#include <gr_io_signature.h> -#include <gr_prefs.h> +#include <gnuradio/io_signature.h> +#include <gnuradio/prefs.h> #include <stdio.h> #include <iostream> #include <stdexcept> @@ -57,21 +57,21 @@ namespace gr { static std::string default_device_name() { - return gr_prefs::singleton()->get_string("audio_alsa", "default_output_device", "hw:0,0"); + return prefs::singleton()->get_string("audio_alsa", "default_output_device", "hw:0,0"); } static double default_period_time() { return std::max(0.001, - gr_prefs::singleton()->get_double("audio_alsa", "period_time", 0.010)); + prefs::singleton()->get_double("audio_alsa", "period_time", 0.010)); } static int default_nperiods() { return std::max(2L, - gr_prefs::singleton()->get_long("audio_alsa", "nperiods", 4)); + prefs::singleton()->get_long("audio_alsa", "nperiods", 4)); } // ---------------------------------------------------------------- @@ -79,9 +79,9 @@ namespace gr { alsa_sink::alsa_sink(int sampling_rate, const std::string device_name, bool ok_to_block) - : gr_sync_block("audio_alsa_sink", - gr_make_io_signature(0, 0, 0), - gr_make_io_signature(0, 0, 0)), + : sync_block("audio_alsa_sink", + io_signature::make(0, 0, 0), + io_signature::make(0, 0, 0)), d_sampling_rate(sampling_rate), d_device_name(device_name.empty() ? default_device_name() : device_name), d_pcm_handle(0), @@ -94,7 +94,7 @@ namespace gr { d_worker(0), d_special_case_mono_to_stereo(false), d_nunderuns(0), d_nsuspends(0), d_ok_to_block(ok_to_block) { - CHATTY_DEBUG = gr_prefs::singleton()->get_bool("audio_alsa", "verbose", false); + CHATTY_DEBUG = prefs::singleton()->get_bool("audio_alsa", "verbose", false); int error; int dir; @@ -131,7 +131,7 @@ namespace gr { min_chan = 1; d_special_case_mono_to_stereo = true; } - set_input_signature(gr_make_io_signature(min_chan, max_chan, + set_input_signature(io_signature::make(min_chan, max_chan, sizeof(float))); // fill in portions of the d_hw_params that we know now... diff --git a/gr-audio/lib/alsa/alsa_sink.h b/gr-audio/lib/alsa/alsa_sink.h index 1dea62f56e..c1e4670341 100644 --- a/gr-audio/lib/alsa/alsa_sink.h +++ b/gr-audio/lib/alsa/alsa_sink.h @@ -27,7 +27,7 @@ #define ALSA_PCM_NEW_HW_PARAMS_API #define ALSA_PCM_NEW_SW_PARAMS_API -#include <audio/sink.h> +#include <gnuradio/audio/sink.h> #include <alsa/asoundlib.h> #include <string> #include <stdexcept> diff --git a/gr-audio/lib/alsa/alsa_source.cc b/gr-audio/lib/alsa/alsa_source.cc index 838da60af3..0f265e75b4 100644 --- a/gr-audio/lib/alsa/alsa_source.cc +++ b/gr-audio/lib/alsa/alsa_source.cc @@ -27,8 +27,8 @@ #include "audio_registry.h" #include <alsa_source.h> #include <alsa_impl.h> -#include <gr_io_signature.h> -#include <gr_prefs.h> +#include <gnuradio/io_signature.h> +#include <gnuradio/prefs.h> #include <stdio.h> #include <iostream> #include <stdexcept> @@ -57,7 +57,7 @@ namespace gr { static std::string default_device_name() { - return gr_prefs::singleton()->get_string("audio_alsa", + return prefs::singleton()->get_string("audio_alsa", "default_input_device", "hw:0,0"); } @@ -66,14 +66,14 @@ namespace gr { default_period_time() { return std::max(0.001, - gr_prefs::singleton()->get_double("audio_alsa", "period_time", 0.010)); + prefs::singleton()->get_double("audio_alsa", "period_time", 0.010)); } static int default_nperiods() { return std::max(2L, - gr_prefs::singleton()->get_long("audio_alsa", "nperiods", 4)); + prefs::singleton()->get_long("audio_alsa", "nperiods", 4)); } // ---------------------------------------------------------------- @@ -81,9 +81,9 @@ namespace gr { alsa_source::alsa_source(int sampling_rate, const std::string device_name, bool ok_to_block) - : gr_sync_block("audio_alsa_source", - gr_make_io_signature(0, 0, 0), - gr_make_io_signature(0, 0, 0)), + : sync_block("audio_alsa_source", + io_signature::make(0, 0, 0), + io_signature::make(0, 0, 0)), d_sampling_rate(sampling_rate), d_device_name(device_name.empty() ? default_device_name() : device_name), d_pcm_handle(0), @@ -97,7 +97,7 @@ namespace gr { d_special_case_stereo_to_mono(false), d_noverruns(0), d_nsuspends(0) { - CHATTY_DEBUG = gr_prefs::singleton()->get_bool("audio_alsa", "verbose", false); + CHATTY_DEBUG = prefs::singleton()->get_bool("audio_alsa", "verbose", false); int error; int dir; @@ -134,7 +134,7 @@ namespace gr { d_special_case_stereo_to_mono = true; } - set_output_signature(gr_make_io_signature(min_chan, max_chan, + set_output_signature(io_signature::make(min_chan, max_chan, sizeof(float))); // fill in portions of the d_hw_params that we know now... diff --git a/gr-audio/lib/alsa/alsa_source.h b/gr-audio/lib/alsa/alsa_source.h index 6314fc1376..88e16932ca 100644 --- a/gr-audio/lib/alsa/alsa_source.h +++ b/gr-audio/lib/alsa/alsa_source.h @@ -27,7 +27,7 @@ #define ALSA_PCM_NEW_HW_PARAMS_API #define ALSA_PCM_NEW_SW_PARAMS_API -#include <audio/source.h> +#include <gnuradio/audio/source.h> #include <alsa/asoundlib.h> #include <string> #include <stdexcept> diff --git a/gr-audio/lib/audio_registry.cc b/gr-audio/lib/audio_registry.cc index 71f9099a63..98848a0f89 100644 --- a/gr-audio/lib/audio_registry.cc +++ b/gr-audio/lib/audio_registry.cc @@ -21,7 +21,7 @@ #include "audio_registry.h" #include <boost/foreach.hpp> -#include <gr_prefs.h> +#include <gnuradio/prefs.h> #include <stdexcept> #include <vector> #include <iostream> @@ -89,7 +89,7 @@ namespace gr { **********************************************************************/ static std::string default_arch_name(void) { - return gr_prefs::singleton()->get_string("audio", "audio_module", "auto"); + return prefs::singleton()->get_string("audio", "audio_module", "auto"); } static void do_arch_warning(const std::string &arch) diff --git a/gr-audio/lib/audio_registry.h b/gr-audio/lib/audio_registry.h index 70612de574..6caf5c4943 100644 --- a/gr-audio/lib/audio_registry.h +++ b/gr-audio/lib/audio_registry.h @@ -22,8 +22,8 @@ #ifndef INCLUDED_GR_AUDIO_REGISTRY_H #define INCLUDED_GR_AUDIO_REGISTRY_H -#include <audio/sink.h> -#include <audio/source.h> +#include <gnuradio/audio/sink.h> +#include <gnuradio/audio/source.h> #include <string> namespace gr { diff --git a/gr-audio/lib/jack/jack_sink.cc b/gr-audio/lib/jack/jack_sink.cc index 9e9d1e34db..c47c37a301 100644 --- a/gr-audio/lib/jack/jack_sink.cc +++ b/gr-audio/lib/jack/jack_sink.cc @@ -27,8 +27,8 @@ #include "audio_registry.h" #include <jack_sink.h> #include <jack_impl.h> -#include <gr_io_signature.h> -#include <gr_prefs.h> +#include <gnuradio/io_signature.h> +#include <gnuradio/prefs.h> #include <stdio.h> #include <iostream> #include <stdexcept> @@ -57,7 +57,7 @@ namespace gr { static std::string default_device_name() { - return gr_prefs::singleton()->get_string + return prefs::singleton()->get_string ("audio_jack", "default_output_device", "gr_sink"); } @@ -98,9 +98,9 @@ namespace gr { jack_sink::jack_sink(int sampling_rate, const std::string device_name, bool ok_to_block) - : gr_sync_block("audio_jack_sink", - gr_make_io_signature(0, 0, 0), - gr_make_io_signature(0, 0, 0)), + : sync_block("audio_jack_sink", + io_signature::make(0, 0, 0), + io_signature::make(0, 0, 0)), d_sampling_rate(sampling_rate), d_device_name(device_name.empty() ? default_device_name() : device_name), d_ok_to_block(ok_to_block), @@ -150,7 +150,7 @@ namespace gr { bail("jack_ringbuffer_create failed", 0); assert(sizeof(float)==sizeof(sample_t)); - set_input_signature(gr_make_io_signature(1, 1, sizeof(sample_t))); + set_input_signature(io_signature::make(1, 1, sizeof(sample_t))); jack_nframes_t sample_rate = jack_get_sample_rate(d_jack_client); diff --git a/gr-audio/lib/jack/jack_sink.h b/gr-audio/lib/jack/jack_sink.h index 2caecbd54c..de34120055 100644 --- a/gr-audio/lib/jack/jack_sink.h +++ b/gr-audio/lib/jack/jack_sink.h @@ -22,7 +22,7 @@ #ifndef INCLUDED_AUDIO_JACK_SINK_H #define INCLUDED_AUDIO_JACK_SINK_H -#include <audio/sink.h> +#include <gnuradio/audio/sink.h> #include <jack/jack.h> #include <jack/ringbuffer.h> #include <string> diff --git a/gr-audio/lib/jack/jack_source.cc b/gr-audio/lib/jack/jack_source.cc index e5a46e3416..a897785b0e 100644 --- a/gr-audio/lib/jack/jack_source.cc +++ b/gr-audio/lib/jack/jack_source.cc @@ -27,8 +27,8 @@ #include "audio_registry.h" #include <jack_source.h> #include <jack_impl.h> -#include <gr_io_signature.h> -#include <gr_prefs.h> +#include <gnuradio/io_signature.h> +#include <gnuradio/prefs.h> #include <stdio.h> #include <iostream> #include <stdexcept> @@ -57,7 +57,7 @@ namespace gr { static std::string default_device_name() { - return gr_prefs::singleton()->get_string + return prefs::singleton()->get_string ("audio_jack", "default_input_device", "gr_source"); } @@ -99,9 +99,9 @@ namespace gr { jack_source::jack_source(int sampling_rate, const std::string device_name, bool ok_to_block) - : gr_sync_block("audio_jack_source", - gr_make_io_signature(0, 0, 0), - gr_make_io_signature(0, 0, 0)), + : sync_block("audio_jack_source", + io_signature::make(0, 0, 0), + io_signature::make(0, 0, 0)), d_sampling_rate(sampling_rate), d_device_name(device_name.empty() ? default_device_name() : device_name), d_ok_to_block(ok_to_block), @@ -149,7 +149,7 @@ namespace gr { bail("jack_ringbuffer_create failed", 0); assert(sizeof(float)==sizeof(sample_t)); - set_output_signature(gr_make_io_signature(1, 1, sizeof(sample_t))); + set_output_signature(io_signature::make(1, 1, sizeof(sample_t))); jack_nframes_t sample_rate = jack_get_sample_rate(d_jack_client); diff --git a/gr-audio/lib/jack/jack_source.h b/gr-audio/lib/jack/jack_source.h index f096220b26..665139289b 100644 --- a/gr-audio/lib/jack/jack_source.h +++ b/gr-audio/lib/jack/jack_source.h @@ -22,7 +22,7 @@ #ifndef INCLUDED_AUDIO_JACK_SOURCE_H #define INCLUDED_AUDIO_JACK_SOURCE_H -#include <audio/source.h> +#include <gnuradio/audio/source.h> #include <jack/jack.h> #include <jack/ringbuffer.h> #include <string> diff --git a/gr-audio/lib/oss/oss_sink.cc b/gr-audio/lib/oss/oss_sink.cc index 129e771fd6..75372b0b43 100644 --- a/gr-audio/lib/oss/oss_sink.cc +++ b/gr-audio/lib/oss/oss_sink.cc @@ -26,8 +26,8 @@ #include "audio_registry.h" #include <oss_sink.h> -#include <gr_io_signature.h> -#include <gr_prefs.h> +#include <gnuradio/io_signature.h> +#include <gnuradio/prefs.h> #include <sys/soundcard.h> #include <sys/ioctl.h> #include <sys/types.h> @@ -52,16 +52,16 @@ namespace gr { static std::string default_device_name() { - return gr_prefs::singleton()->get_string + return prefs::singleton()->get_string ("audio_oss", "default_output_device", "/dev/dsp"); } oss_sink::oss_sink(int sampling_rate, const std::string device_name, bool ok_to_block) - : gr_sync_block("audio_oss_sink", - gr_make_io_signature(1, 2, sizeof(float)), - gr_make_io_signature(0, 0, 0)), + : sync_block("audio_oss_sink", + io_signature::make(1, 2, sizeof(float)), + io_signature::make(0, 0, 0)), d_sampling_rate(sampling_rate), d_device_name(device_name.empty() ? default_device_name() : device_name), d_fd(-1), d_buffer(0), d_chunk_size(0) @@ -74,7 +74,7 @@ namespace gr { double CHUNK_TIME = std::max(0.001, - gr_prefs::singleton()->get_double("audio_oss", "latency", 0.005)); + prefs::singleton()->get_double("audio_oss", "latency", 0.005)); d_chunk_size = (int)(d_sampling_rate * CHUNK_TIME); set_output_multiple(d_chunk_size); diff --git a/gr-audio/lib/oss/oss_sink.h b/gr-audio/lib/oss/oss_sink.h index 3bb5f4ee1a..e190944857 100644 --- a/gr-audio/lib/oss/oss_sink.h +++ b/gr-audio/lib/oss/oss_sink.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_AUDIO_OSS_SINK_H #define INCLUDED_AUDIO_OSS_SINK_H -#include <audio/sink.h> +#include <gnuradio/audio/sink.h> #include <string> namespace gr { diff --git a/gr-audio/lib/oss/oss_source.cc b/gr-audio/lib/oss/oss_source.cc index 6d6bafceb8..0d27f74fa8 100644 --- a/gr-audio/lib/oss/oss_source.cc +++ b/gr-audio/lib/oss/oss_source.cc @@ -26,8 +26,8 @@ #include "audio_registry.h" #include <oss_source.h> -#include <gr_io_signature.h> -#include <gr_prefs.h> +#include <gnuradio/io_signature.h> +#include <gnuradio/prefs.h> #include <sys/soundcard.h> #include <sys/ioctl.h> #include <sys/types.h> @@ -52,16 +52,16 @@ namespace gr { static std::string default_device_name() { - return gr_prefs::singleton()->get_string + return prefs::singleton()->get_string ("audio_oss", "default_input_device", "/dev/dsp"); } oss_source::oss_source(int sampling_rate, const std::string device_name, bool ok_to_block) - : gr_sync_block("audio_oss_source", - gr_make_io_signature(0, 0, 0), - gr_make_io_signature(1, 2, sizeof(float))), + : sync_block("audio_oss_source", + io_signature::make(0, 0, 0), + io_signature::make(1, 2, sizeof(float))), d_sampling_rate(sampling_rate), d_device_name(device_name.empty() ? default_device_name() : device_name), d_fd(-1), d_buffer(0), d_chunk_size(0) @@ -73,7 +73,7 @@ namespace gr { } double CHUNK_TIME = - std::max(0.001, gr_prefs::singleton()->get_double("audio_oss", "latency", 0.005)); + std::max(0.001, prefs::singleton()->get_double("audio_oss", "latency", 0.005)); d_chunk_size = (int)(d_sampling_rate * CHUNK_TIME); set_output_multiple(d_chunk_size); diff --git a/gr-audio/lib/oss/oss_source.h b/gr-audio/lib/oss/oss_source.h index bf5183bd32..6f1df26a11 100644 --- a/gr-audio/lib/oss/oss_source.h +++ b/gr-audio/lib/oss/oss_source.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_AUDIO_OSS_SOURCE_H #define INCLUDED_AUDIO_OSS_SOURCE_H -#include <audio/source.h> +#include <gnuradio/audio/source.h> #include <string> namespace gr { diff --git a/gr-audio/lib/osx/circular_buffer.h b/gr-audio/lib/osx/circular_buffer.h index 7abbeaeb0c..fee9eeafbc 100644 --- a/gr-audio/lib/osx/circular_buffer.h +++ b/gr-audio/lib/osx/circular_buffer.h @@ -23,7 +23,7 @@ #ifndef _CIRCULAR_BUFFER_H_ #define _CIRCULAR_BUFFER_H_ -#include <thread/thread.h> +#include <gnuradio/thread/thread.h> #include <iostream> #include <stdexcept> diff --git a/gr-audio/lib/osx/osx_sink.cc b/gr-audio/lib/osx/osx_sink.cc index b7fe4e9d11..7c5be43d76 100644 --- a/gr-audio/lib/osx/osx_sink.cc +++ b/gr-audio/lib/osx/osx_sink.cc @@ -27,7 +27,7 @@ #include "audio_registry.h" #include <osx_sink.h> #include <osx_impl.h> -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <stdexcept> namespace gr { @@ -48,9 +48,9 @@ namespace gr { bool do_block, int channel_config, int max_sample_count) - : gr_sync_block("audio_osx_sink", - gr_make_io_signature(0, 0, 0), - gr_make_io_signature(0, 0, 0)), + : sync_block("audio_osx_sink", + io_signature::make(0, 0, 0), + io_signature::make(0, 0, 0)), d_sample_rate(0.0), d_channel_config(0), d_n_channels(0), d_queueSampleCount(0), d_max_sample_count(0), d_do_block(do_block), d_internal(0), d_cond_data(0), @@ -84,7 +84,7 @@ namespace gr { // set the input signature - set_input_signature(gr_make_io_signature(1, d_n_channels, sizeof(float))); + set_input_signature(io_signature::make(1, d_n_channels, sizeof(float))); // check that the max # of samples to store is valid diff --git a/gr-audio/lib/osx/osx_sink.h b/gr-audio/lib/osx/osx_sink.h index 153d2d76e6..241e10ab79 100644 --- a/gr-audio/lib/osx/osx_sink.h +++ b/gr-audio/lib/osx/osx_sink.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_AUDIO_OSX_SINK_H #define INCLUDED_AUDIO_OSX_SINK_H -#include <audio/sink.h> +#include <gnuradio/audio/sink.h> #include <string> #include <list> #include <AudioUnit/AudioUnit.h> diff --git a/gr-audio/lib/osx/osx_source.cc b/gr-audio/lib/osx/osx_source.cc index c666bb7ad8..3e2dcef4fe 100644 --- a/gr-audio/lib/osx/osx_source.cc +++ b/gr-audio/lib/osx/osx_source.cc @@ -27,7 +27,7 @@ #include "audio_registry.h" #include <osx_source.h> #include <osx_impl.h> -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <stdexcept> namespace gr { @@ -71,9 +71,9 @@ namespace gr { bool do_block, int channel_config, int max_sample_count) - : gr_sync_block("audio_osx_source", - gr_make_io_signature(0, 0, 0), - gr_make_io_signature(0, 0, 0)), + : sync_block("audio_osx_source", + io_signature::make(0, 0, 0), + io_signature::make(0, 0, 0)), d_deviceSampleRate(0.0), d_outputSampleRate(0.0), d_channel_config(0), d_inputBufferSizeFrames(0), d_inputBufferSizeBytes(0), @@ -310,7 +310,7 @@ namespace gr { // create the output io signature; // no input siganture to set (source is hardware) - set_output_signature(gr_make_io_signature(1, + set_output_signature(io_signature::make(1, d_n_max_channels, sizeof(float))); diff --git a/gr-audio/lib/osx/osx_source.h b/gr-audio/lib/osx/osx_source.h index 03a2d8879c..0b675f8863 100644 --- a/gr-audio/lib/osx/osx_source.h +++ b/gr-audio/lib/osx/osx_source.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_AUDIO_OSX_SOURCE_H #define INCLUDED_AUDIO_OSX_SOURCE_H -#include <audio/source.h> +#include <gnuradio/audio/source.h> #include <string> #include <AudioToolbox/AudioToolbox.h> #include <AudioUnit/AudioUnit.h> diff --git a/gr-audio/lib/portaudio/portaudio_sink.cc b/gr-audio/lib/portaudio/portaudio_sink.cc index 746894e494..089dedc33e 100644 --- a/gr-audio/lib/portaudio/portaudio_sink.cc +++ b/gr-audio/lib/portaudio/portaudio_sink.cc @@ -27,8 +27,8 @@ #include "audio_registry.h" #include <portaudio_sink.h> #include <portaudio_impl.h> -#include <gr_io_signature.h> -#include <gr_prefs.h> +#include <gnuradio/io_signature.h> +#include <gnuradio/prefs.h> #include <stdio.h> #include <iostream> #include <unistd.h> @@ -58,7 +58,7 @@ namespace gr { static std::string default_device_name() { - return gr_prefs::singleton()->get_string + return prefs::singleton()->get_string ("audio_portaudio", "default_output_device", ""); } @@ -73,8 +73,8 @@ namespace gr { } // FYI, the buffer indicies are in units of samples. - d_writer = gr_make_buffer(N_BUFFERS * bufsize_samples, sizeof(sample_t)); - d_reader = gr_buffer_add_reader(d_writer, 0); + d_writer = gr::make_buffer(N_BUFFERS * bufsize_samples, sizeof(sample_t)); + d_reader = gr::buffer_add_reader(d_writer, 0); } /* @@ -137,13 +137,13 @@ namespace gr { portaudio_sink::portaudio_sink(int sampling_rate, const std::string device_name, bool ok_to_block) - : gr_sync_block("audio_portaudio_sink", - gr_make_io_signature(0, 0, 0), - gr_make_io_signature(0, 0, 0)), + : sync_block("audio_portaudio_sink", + io_signature::make(0, 0, 0), + io_signature::make(0, 0, 0)), d_sampling_rate(sampling_rate), d_device_name(device_name.empty() ? default_device_name() : device_name), d_ok_to_block(ok_to_block), - d_verbose(gr_prefs::singleton()->get_bool("audio_portaudio", "verbose", false)), + d_verbose(prefs::singleton()->get_bool("audio_portaudio", "verbose", false)), d_portaudio_buffer_size_frames(0), d_stream(0), d_ringbuffer_mutex(), @@ -226,7 +226,7 @@ namespace gr { // supported by the h/w, we can compute a reasonable input // signature. The portaudio specs say that they'll accept any // number of channels from 1 to max. - set_input_signature(gr_make_io_signature(1, deviceInfo->maxOutputChannels, + set_input_signature(io_signature::make(1, deviceInfo->maxOutputChannels, sizeof(sample_t))); } diff --git a/gr-audio/lib/portaudio/portaudio_sink.h b/gr-audio/lib/portaudio/portaudio_sink.h index e69f96b252..6327f4397c 100644 --- a/gr-audio/lib/portaudio/portaudio_sink.h +++ b/gr-audio/lib/portaudio/portaudio_sink.h @@ -22,9 +22,9 @@ #ifndef INCLUDED_AUDIO_PORTAUDIO_SINK_H #define INCLUDED_AUDIO_PORTAUDIO_SINK_H -#include <audio/sink.h> -#include <gr_buffer.h> -#include <thread/thread.h> +#include <gnuradio/audio/sink.h> +#include <gnuradio/buffer.h> +#include <gnuradio/thread/thread.h> #include <string> #include <portaudio.h> #include <stdexcept> @@ -55,8 +55,8 @@ namespace gr { PaStream *d_stream; PaStreamParameters d_output_parameters; - gr_buffer_sptr d_writer; // buffer used between work and callback - gr_buffer_reader_sptr d_reader; + gr::buffer_sptr d_writer; // buffer used between work and callback + gr::buffer_reader_sptr d_reader; gr::thread::mutex d_ringbuffer_mutex; gr::thread::condition_variable d_ringbuffer_cond; diff --git a/gr-audio/lib/portaudio/portaudio_source.cc b/gr-audio/lib/portaudio/portaudio_source.cc index 500d3109e5..5d081f63e2 100644 --- a/gr-audio/lib/portaudio/portaudio_source.cc +++ b/gr-audio/lib/portaudio/portaudio_source.cc @@ -27,8 +27,8 @@ #include "audio_registry.h" #include <portaudio_source.h> #include <portaudio_impl.h> -#include <gr_io_signature.h> -#include <gr_prefs.h> +#include <gnuradio/io_signature.h> +#include <gnuradio/prefs.h> #include <stdio.h> #include <iostream> #include <unistd.h> @@ -58,7 +58,7 @@ namespace gr { static std::string default_device_name() { - return gr_prefs::singleton()->get_string + return prefs::singleton()->get_string ("audio_portaudio", "default_input_device", ""); } @@ -73,8 +73,8 @@ namespace gr { } // FYI, the buffer indicies are in units of samples. - d_writer = gr_make_buffer(N_BUFFERS * bufsize_samples, sizeof(sample_t)); - d_reader = gr_buffer_add_reader(d_writer, 0); + d_writer = gr::make_buffer(N_BUFFERS * bufsize_samples, sizeof(sample_t)); + d_reader = gr::buffer_add_reader(d_writer, 0); } /* @@ -136,13 +136,13 @@ namespace gr { portaudio_source::portaudio_source(int sampling_rate, const std::string device_name, bool ok_to_block) - : gr_sync_block("audio_portaudio_source", - gr_make_io_signature(0, 0, 0), - gr_make_io_signature(0, 0, 0)), + : sync_block("audio_portaudio_source", + io_signature::make(0, 0, 0), + io_signature::make(0, 0, 0)), d_sampling_rate(sampling_rate), d_device_name(device_name.empty() ? default_device_name() : device_name), d_ok_to_block(ok_to_block), - d_verbose(gr_prefs::singleton()->get_bool("audio_portaudio", "verbose", false)), + d_verbose(prefs::singleton()->get_bool("audio_portaudio", "verbose", false)), d_portaudio_buffer_size_frames(0), d_stream(0), d_ringbuffer_mutex(), @@ -221,7 +221,7 @@ namespace gr { // supported by the h/w, we can compute a reasonable output // signature. The portaudio specs say that they'll accept any // number of channels from 1 to max. - set_output_signature(gr_make_io_signature(1, deviceInfo->maxInputChannels, + set_output_signature(io_signature::make(1, deviceInfo->maxInputChannels, sizeof (sample_t))); } diff --git a/gr-audio/lib/portaudio/portaudio_source.h b/gr-audio/lib/portaudio/portaudio_source.h index 6a3419b613..b42f9a3a9b 100644 --- a/gr-audio/lib/portaudio/portaudio_source.h +++ b/gr-audio/lib/portaudio/portaudio_source.h @@ -23,9 +23,9 @@ #ifndef INCLUDED_AUDIO_PORTAUDIO_SOURCE_H #define INCLUDED_AUDIO_PORTAUDIO_SOURCE_H -#include <audio/source.h> -#include <gr_buffer.h> -#include <thread/thread.h> +#include <gnuradio/audio/source.h> +#include <gnuradio/buffer.h> +#include <gnuradio/thread/thread.h> #include <string> #include <portaudio.h> #include <stdexcept> @@ -55,8 +55,8 @@ namespace gr { PaStream *d_stream; PaStreamParameters d_input_parameters; - gr_buffer_sptr d_writer; // buffer used between work and callback - gr_buffer_reader_sptr d_reader; + gr::buffer_sptr d_writer; // buffer used between work and callback + gr::buffer_reader_sptr d_reader; gr::thread::mutex d_ringbuffer_mutex; gr::thread::condition_variable d_ringbuffer_cond; diff --git a/gr-audio/lib/windows/windows_sink.cc b/gr-audio/lib/windows/windows_sink.cc index f372bd0e75..4241a5c16b 100644 --- a/gr-audio/lib/windows/windows_sink.cc +++ b/gr-audio/lib/windows/windows_sink.cc @@ -26,7 +26,7 @@ #include "audio_registry.h" #include <windows_sink.h> -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> @@ -59,9 +59,9 @@ namespace gr { } windows_sink::windows_sink(int sampling_freq, const std::string device_name) - : gr_sync_block("audio_windows_sink", - gr_make_io_signature(1, 2, sizeof(float)), - gr_make_io_signature(0, 0, 0)), + : sync_block("audio_windows_sink", + io_signature::make(1, 2, sizeof(float)), + io_signature::make(0, 0, 0)), d_sampling_freq(sampling_freq), d_device_name(device_name.empty() ? default_device_name() : device_name), d_fd(-1), d_buffer(0), d_chunk_size(0) diff --git a/gr-audio/lib/windows/windows_sink.h b/gr-audio/lib/windows/windows_sink.h index beaccc9054..3d21cc47a3 100644 --- a/gr-audio/lib/windows/windows_sink.h +++ b/gr-audio/lib/windows/windows_sink.h @@ -29,7 +29,7 @@ #include <windows.h> #include <mmsystem.h> -#include <audio/sink.h> +#include <gnuradio/audio/sink.h> #include <string> namespace gr { diff --git a/gr-audio/lib/windows/windows_source.cc b/gr-audio/lib/windows/windows_source.cc index 89371cfa84..5180868f2e 100644 --- a/gr-audio/lib/windows/windows_source.cc +++ b/gr-audio/lib/windows/windows_source.cc @@ -26,7 +26,7 @@ #include "audio_registry.h" #include <windows_source.h> -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> //include <sys/soundcard.h> //include <sys/ioctl.h> #include <sys/types.h> @@ -60,9 +60,9 @@ namespace gr { windows_source::windows_source(int sampling_freq, const std::string device_name) - : gr_sync_block("audio_windows_source", - gr_make_io_signature(0, 0, 0), - gr_make_io_signature(1, 2, sizeof(float))), + : sync_block("audio_windows_source", + io_signature::make(0, 0, 0), + io_signature::make(1, 2, sizeof(float))), d_sampling_freq(sampling_freq), d_device_name(device_name.empty() ? default_device_name() : device_name), d_fd(-1), d_buffer(0), d_chunk_size(0) diff --git a/gr-audio/lib/windows/windows_source.h b/gr-audio/lib/windows/windows_source.h index 18507d14b7..9814d12f54 100644 --- a/gr-audio/lib/windows/windows_source.h +++ b/gr-audio/lib/windows/windows_source.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_AUDIO_WINDOWS_SOURCE_H #define INCLUDED_AUDIO_WINDOWS_SOURCE_H -#include <audio/source.h> +#include <gnuradio/audio/source.h> #include <string> namespace gr { |