diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2013-04-17 13:43:52 -0400 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2013-04-29 14:52:56 -0400 |
| commit | f3e2e07201c50033bf6c9d0c6a6f068557b4f17f (patch) | |
| tree | 140b3c2d20a951ffd4abd564c3378ee2e2f9fc7c /gr-audio/lib/jack | |
| parent | 35303ae975a5b1bdecc2492bc96e2b8e89b62a3d (diff) | |
runtime: converting runtime core to gr namespace, gnuradio include dir.
Diffstat (limited to 'gr-audio/lib/jack')
| -rw-r--r-- | gr-audio/lib/jack/jack_sink.cc | 14 | ||||
| -rw-r--r-- | gr-audio/lib/jack/jack_source.cc | 14 |
2 files changed, 14 insertions, 14 deletions
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_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); |