diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2017-05-09 12:52:59 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2017-05-09 12:52:59 -0700 |
| commit | 69172b07723872df00ac1ab821acebd2b0a56e6a (patch) | |
| tree | 0f74ec81c7e9965a4dec39fc6c0cca407bbd9a53 /gr-audio/include/gnuradio/audio/osx_impl.h | |
| parent | 9ed7f6e9944846db9c948498ad5ac0cb37988244 (diff) | |
| parent | a78f057937bb9ba91965b06869a3ed417724516e (diff) | |
Merge branch 'next' into python3
Diffstat (limited to 'gr-audio/include/gnuradio/audio/osx_impl.h')
| -rw-r--r-- | gr-audio/include/gnuradio/audio/osx_impl.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/gr-audio/include/gnuradio/audio/osx_impl.h b/gr-audio/include/gnuradio/audio/osx_impl.h index 891685a335..6db130447e 100644 --- a/gr-audio/include/gnuradio/audio/osx_impl.h +++ b/gr-audio/include/gnuradio/audio/osx_impl.h @@ -33,10 +33,6 @@ #include <AudioToolbox/AudioToolbox.h> #include <AudioUnit/AudioUnit.h> -namespace gr { -namespace audio { -namespace osx { - // Check the version of MacOSX being used #ifdef __APPLE_CC__ #include <AvailabilityMacros.h> @@ -50,15 +46,19 @@ namespace osx { // helper function to print an ASBD -extern std::ostream& GR_AUDIO_API +std::ostream& GR_AUDIO_API operator<< (std::ostream& s, const AudioStreamBasicDescription& asbd); +namespace gr { +namespace audio { +namespace osx { + // returns the number of channels for the provided AudioDeviceID, // input and/or output depending on if the pointer is valid. -extern void GR_AUDIO_API +void GR_AUDIO_API get_num_channels_for_audio_device_id (AudioDeviceID ad_id, UInt32* n_input, @@ -70,7 +70,7 @@ get_num_channels_for_audio_device_id // matching names. If the device name is empty, then match all // input or output devices. -extern void GR_AUDIO_API +void GR_AUDIO_API find_audio_devices (const std::string& device_name, bool is_input, |