diff options
author | Tom Rondeau <tom@trondeau.com> | 2014-08-13 16:06:19 -0400 |
---|---|---|
committer | Tom Rondeau <tom@trondeau.com> | 2014-08-13 17:06:15 -0400 |
commit | 2fc6293932564fd9f84a31898aa11c0b9a3b44cc (patch) | |
tree | 08ab00c8881968bcb86dfae04682ddbbf6cab8ac /gr-audio/lib/osx | |
parent | f1c8ab4aff39340da87b82758263c11b4c9a6754 (diff) |
audio: modified the audio registration system.
Instead of static functions and macros, this just uses simple ifdefs in the code to register new audio components if cmake found them. The code is more complicated for the developer, if we ever add a new audio machine. But this allows us to use gr-audio in statically linked cases.
Diffstat (limited to 'gr-audio/lib/osx')
-rw-r--r-- | gr-audio/lib/osx/osx_sink.cc | 8 | ||||
-rw-r--r-- | gr-audio/lib/osx/osx_source.cc | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/gr-audio/lib/osx/osx_sink.cc b/gr-audio/lib/osx/osx_sink.cc index dc21ab2025..0b304eea3f 100644 --- a/gr-audio/lib/osx/osx_sink.cc +++ b/gr-audio/lib/osx/osx_sink.cc @@ -34,10 +34,10 @@ namespace gr { namespace audio { - AUDIO_REGISTER_SINK(REG_PRIO_HIGH, osx) - (int sampling_rate, - const std::string& device_name, - bool ok_to_block) + sink::sptr + osx_sink_fcn(int sampling_rate, + const std::string& device_name, + bool ok_to_block) { return sink::sptr (new osx_sink(sampling_rate, device_name, ok_to_block)); diff --git a/gr-audio/lib/osx/osx_source.cc b/gr-audio/lib/osx/osx_source.cc index b51a6563ed..e37fc07d96 100644 --- a/gr-audio/lib/osx/osx_source.cc +++ b/gr-audio/lib/osx/osx_source.cc @@ -34,10 +34,10 @@ namespace gr { namespace audio { - AUDIO_REGISTER_SOURCE(REG_PRIO_HIGH, osx) - (int sampling_rate, - const std::string& device_name, - bool ok_to_block) + source::sptr + osx_source_fcn(int sampling_rate, + const std::string& device_name, + bool ok_to_block) { return source::sptr (new osx_source(sampling_rate, device_name, ok_to_block)); |