diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2015-10-17 21:37:33 -0400 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2015-10-18 23:03:13 +0200 |
| commit | 38efd580b2256597f7c1001288b9581788557321 (patch) | |
| tree | d32a707abd6407e652a82da5451ce763c5abb922 /libs/ardour/ardour | |
| parent | 66704eefcbe132eac0415434340f788808c40302 (diff) | |
libs/* changes use new AppleUtility Library
Diffstat (limited to 'libs/ardour/ardour')
| -rw-r--r-- | libs/ardour/ardour/audio_unit.h | 3 | ||||
| -rw-r--r-- | libs/ardour/ardour/caimportable.h | 10 | ||||
| -rw-r--r-- | libs/ardour/ardour/coreaudiosource.h | 10 |
3 files changed, 19 insertions, 4 deletions
diff --git a/libs/ardour/ardour/audio_unit.h b/libs/ardour/ardour/audio_unit.h index 41654a811a..85be9b7cfa 100644 --- a/libs/ardour/ardour/audio_unit.h +++ b/libs/ardour/ardour/audio_unit.h @@ -34,7 +34,7 @@ #include <AudioUnit/AudioUnit.h> #include <AudioUnit/AudioUnitProperties.h> -#include "appleutility/AUParamInfo.h" +#include "AUParamInfo.h" #include <boost/shared_ptr.hpp> @@ -244,7 +244,6 @@ class LIBARDOUR_API AUPluginInfo : public PluginInfo { static PluginInfoList* discover (bool scan_only); static bool au_get_crashlog (std::string &msg); - static void get_names (CAComponentDescription&, std::string& name, std::string& maker); static std::string stringify_descriptor (const CAComponentDescription&); static int load_cached_info (); diff --git a/libs/ardour/ardour/caimportable.h b/libs/ardour/ardour/caimportable.h index 211329b8c6..441008f521 100644 --- a/libs/ardour/ardour/caimportable.h +++ b/libs/ardour/ardour/caimportable.h @@ -25,7 +25,11 @@ #include "ardour/types.h" #include "ardour/importable_source.h" -#include <appleutility/CAAudioFile.h> +#ifdef COREAUDIO105 +#include "CAAudioFile.h" +#else +#include "CAExtAudioFile.h" +#endif namespace ARDOUR { @@ -43,7 +47,11 @@ class LIBARDOUR_API CAImportableSource : public ImportableSource { bool clamped_at_unity () const { return false; } protected: +#ifdef COREAUDIO105 mutable CAAudioFile af; +#else + mutable CAExtAudioFile af; +#endif }; } diff --git a/libs/ardour/ardour/coreaudiosource.h b/libs/ardour/ardour/coreaudiosource.h index d8175877b8..bb00776839 100644 --- a/libs/ardour/ardour/coreaudiosource.h +++ b/libs/ardour/ardour/coreaudiosource.h @@ -20,7 +20,11 @@ #ifndef __coreaudio_source_h__ #define __coreaudio_source_h__ -#include <appleutility/CAAudioFile.h> +#ifdef COREAUDIO105 +#include "CAAudioFile.h" +#else +#include "CAExtAudioFile.h" +#endif #include "ardour/audiofilesource.h" #include <string> @@ -55,7 +59,11 @@ class LIBARDOUR_API CoreAudioSource : public AudioFileSource { framecnt_t write_unlocked (Sample *, framecnt_t) { return 0; } private: +#ifdef COREAUDIO105 mutable CAAudioFile af; +#else + mutable CAExtAudioFile af; +#endif uint16_t n_channels; void init_cafile (); |