From 4aeebb914eedf9279e4904786ce42518611de137 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Tue, 18 Oct 2011 15:08:42 +0000 Subject: changes for OS X support: change waf config define to COREAUDIO_SUPPORT, remove PluginInsert call to IO::PortCountChanged, remove use of explicit Carbon linkage, fix up AudioUnit internals to actually work (Cocoa GUIs still currently broken) git-svn-id: svn://localhost/ardour2/branches/3.0@10224 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/ardour/source_factory.cc | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'libs/ardour/source_factory.cc') diff --git a/libs/ardour/source_factory.cc b/libs/ardour/source_factory.cc index 3ea63a75ed..65f9d8da28 100644 --- a/libs/ardour/source_factory.cc +++ b/libs/ardour/source_factory.cc @@ -40,10 +40,6 @@ #include "ardour/session.h" #ifdef HAVE_COREAUDIO -#define USE_COREAUDIO_FOR_FILES -#endif - -#ifdef USE_COREAUDIO_FOR_FILES #include "ardour/coreaudiosource.h" #endif @@ -188,7 +184,7 @@ SourceFactory::create (Session& s, const XMLNode& node, bool defer_peaks) catch (failed_constructor& err) { -#ifdef USE_COREAUDIO_FOR_FILES +#ifdef HAVE_COREAUDIO /* this is allowed to throw */ @@ -252,7 +248,7 @@ SourceFactory::createReadable (DataType type, Session& s, const string& path, } catch (failed_constructor& err) { -#ifdef USE_COREAUDIO_FOR_FILES +#ifdef HAVE_COREAUDIO Source* src = new CoreAudioSource (s, path, chn, flags); #ifdef BOOST_SP_ENABLE_DEBUG_HOOKS @@ -350,7 +346,7 @@ SourceFactory::createWritable (DataType type, Session& s, const std::string& pat } boost::shared_ptr -SourceFactory::createFromPlaylist (DataType type, Session& s, boost::shared_ptr p, const ID& orig, const std::string& name, +SourceFactory::createFromPlaylist (DataType type, Session& s, boost::shared_ptr p, const PBD::ID& orig, const std::string& name, uint32_t chn, frameoffset_t start, framecnt_t len, bool copy, bool defer_peaks) { if (type == DataType::AUDIO) { -- cgit v1.2.3