diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2017-05-09 12:20:33 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2017-05-09 12:20:33 -0700 |
| commit | a78f057937bb9ba91965b06869a3ed417724516e (patch) | |
| tree | a3271eec8696ef1f0a7b0215b0ae9c687fde5a64 /gr-audio/lib | |
| parent | 2933a6709410a4ba40b4286e369b29bd24cbd37e (diff) | |
| parent | 3e3ed2f6aee01f8d2216463511591cd2c0bf4312 (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'gr-audio/lib')
| -rw-r--r-- | gr-audio/lib/osx/osx_common.h | 5 | ||||
| -rw-r--r-- | gr-audio/lib/osx/osx_impl.cc | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/gr-audio/lib/osx/osx_common.h b/gr-audio/lib/osx/osx_common.h index 59b866dbe3..5d8a3800a5 100644 --- a/gr-audio/lib/osx/osx_common.h +++ b/gr-audio/lib/osx/osx_common.h @@ -29,8 +29,13 @@ namespace gr { namespace audio { namespace osx { +#ifndef _OSX_AU_DEBUG_ #define _OSX_AU_DEBUG_ 0 +#endif + +#ifndef _OSX_AU_DEBUG_RENDER_ #define _OSX_AU_DEBUG_RENDER_ 0 +#endif #define check_error_and_throw(err,what,throw_str) \ if(err) { \ 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, |