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/lib/osx/osx_impl.cc | |
| parent | 9ed7f6e9944846db9c948498ad5ac0cb37988244 (diff) | |
| parent | a78f057937bb9ba91965b06869a3ed417724516e (diff) | |
Merge branch 'next' into python3
Diffstat (limited to 'gr-audio/lib/osx/osx_impl.cc')
| -rw-r--r-- | gr-audio/lib/osx/osx_impl.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gr-audio/lib/osx/osx_impl.cc b/gr-audio/lib/osx/osx_impl.cc index aa0320d18a..d18c24c786 100644 --- a/gr-audio/lib/osx/osx_impl.cc +++ b/gr-audio/lib/osx/osx_impl.cc @@ -33,10 +33,6 @@ #include <locale> #include <stdexcept> -namespace gr { -namespace audio { -namespace osx { - std::ostream& operator<< (std::ostream& s, @@ -70,6 +66,10 @@ operator<< return(s); }; +namespace gr { +namespace audio { +namespace osx { + static UInt32 _get_num_channels (AudioDeviceID ad_id, |