From 9bc22f6f86deb4258faf298b45cb117f09af8f96 Mon Sep 17 00:00:00 2001 From: Taybin Rutkin Date: Thu, 31 Aug 2006 16:34:42 +0000 Subject: Fixed compilation of CoreAudioSource Seperated AUDIOUNITS support from COREAUDIO support. Fixed metadata saving in SfdbUI. git-svn-id: svn://localhost/ardour2/trunk@879 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/ardour/SConscript | 17 +++++++++++------ libs/ardour/ardour/utils.h | 5 +++-- libs/ardour/audio_library.cc | 6 +++--- libs/ardour/audio_unit.cc | 1 + libs/ardour/coreaudiosource.cc | 4 ---- libs/ardour/insert.cc | 11 ++++++----- libs/ardour/plugin.cc | 3 ++- libs/ardour/source_factory.cc | 6 ++++-- libs/ardour/utils.cc | 3 +-- 9 files changed, 31 insertions(+), 25 deletions(-) (limited to 'libs/ardour') diff --git a/libs/ardour/SConscript b/libs/ardour/SConscript index 55acb865d1..63c0cdd96f 100644 --- a/libs/ardour/SConscript +++ b/libs/ardour/SConscript @@ -102,7 +102,8 @@ arch_specific_objects = [ ] osc_files = [ 'osc.cc' ] vst_files = [ 'vst_plugin.cc', 'session_vst.cc' ] -coreaudio_files = [ 'audio_unit.cc', 'coreaudiosource.cc' ] +audiounit_files = [ 'audio_unit.cc' ] +coreaudio_files = [ 'coreaudiosource.cc' ] extra_sources = [ ] if ardour['VST']: @@ -180,11 +181,15 @@ if conf.CheckCHeader('sys/vfs.h'): if conf.CheckCHeader('/System/Library/Frameworks/CoreMIDI.framework/Headers/CoreMIDI.h'): ardour.Append(LINKFLAGS="-framework CoreMIDI") -if conf.CheckCHeader('/System/Library/Frameworks/AudioToolbox.framework/Headers/ExtendedAudioFile.h') and ardour['COREAUDIO'] == 1: +if conf.CheckCHeader('/System/Library/Frameworks/AudioUnit.framework/Headers/AudioUnit.h') and ardour['AUDIOUNITS']: + ardour.Append(CXXFLAGS="-DHAVE_AUDIOUNITS") + ardour.Append(LINKFLAGS="-framework AudioUnit") + extra_sources += audiounit_files + +if conf.CheckCHeader('/System/Library/Frameworks/AudioToolbox.framework/Headers/ExtendedAudioFile.h') and ardour['COREAUDIO']: ardour.Append(CXXFLAGS="-DHAVE_COREAUDIO") ardour.Append(LINKFLAGS="-framework AudioToolbox") extra_sources += coreaudio_files - if env['CONFIG_ARCH'] == 'apple': # this next line avoids issues with circular dependencies between libardour and libardour_cp. @@ -212,7 +217,7 @@ ardour.Merge ([ if ardour['LIBLO']: ardour.Merge ([ libraries['lo'] ]) -if ardour['COREAUDIO']: +if ardour['COREAUDIO'] or ardour['AUDIOUNITS']: ardour.Merge ([ libraries['appleutility'] ]) ardour.VersionBuild(['version.cc', 'ardour/version.h'], 'SConscript') @@ -242,12 +247,12 @@ libardour = ardour.SharedLibrary('ardour', ardour_files + extra_sources + arch_s Default(libardour) if env['NLS']: - i18n (ardour, ardour_files + vst_files + coreaudio_files, env) + i18n (ardour, ardour_files + vst_files + coreaudio_files + audiounit_files, env) env.Alias('install', env.Install(os.path.join(install_prefix, 'lib/ardour2'), libardour)) env.Alias('tarball', env.Distribute (env['DISTTREE'], [ 'SConscript', 'i18n.h', 'gettext.h', 'sse_functions.s', 'sse_functions_64bit.s' ] + - ardour_files + vst_files + coreaudio_files + + ardour_files + vst_files + coreaudio_files + audiounit_files + glob.glob('po/*.po') + glob.glob('ardour/*.h'))) diff --git a/libs/ardour/ardour/utils.h b/libs/ardour/ardour/utils.h index 5128c98a77..214e74156c 100644 --- a/libs/ardour/ardour/utils.h +++ b/libs/ardour/ardour/utils.h @@ -25,7 +25,7 @@ #include #include -#ifdef HAVE_COREAUDIO +#if defined(HAVE_COREAUDIO) || defined(HAVE_AUDIOUNITS) #include #endif @@ -59,8 +59,9 @@ std::string path_expand (std::string); void compute_equal_power_fades (jack_nframes_t nframes, float* in, float* out); -#ifdef HAVE_COREAUDIO +#if defined(HAVE_COREAUDIO) || defined(HAVE_AUDIOUNITS) std::string CFStringRefToStdString(CFStringRef stringRef); #endif // HAVE_COREAUDIO #endif /* __ardour_utils_h__ */ + diff --git a/libs/ardour/audio_library.cc b/libs/ardour/audio_library.cc index ad008f6312..3aa6d05be1 100644 --- a/libs/ardour/audio_library.cc +++ b/libs/ardour/audio_library.cc @@ -432,9 +432,9 @@ AudioLibrary::safe_file_extension(string file) file.rfind(".vwe") == string::npos && file.rfind(".paf") == string::npos && #ifdef HAVE_COREAUDIO - file.rfind(".mp3") == string::npos && - file.rfind(".aac") == string::npos && - file.rfind(".mp4") == string::npos && + file.rfind(".mp3") == string::npos && + file.rfind(".aac") == string::npos && + file.rfind(".mp4") == string::npos && #endif // HAVE_COREAUDIO file.rfind(".voc") == string::npos); } diff --git a/libs/ardour/audio_unit.cc b/libs/ardour/audio_unit.cc index ad98621814..57d5505a0f 100644 --- a/libs/ardour/audio_unit.cc +++ b/libs/ardour/audio_unit.cc @@ -394,3 +394,4 @@ AUPluginInfo::setup_nchannels (CAComponentDescription& comp_desc) 0, &cinfo, &info_size); } } + diff --git a/libs/ardour/coreaudiosource.cc b/libs/ardour/coreaudiosource.cc index 19b75619e3..0d7e690a25 100644 --- a/libs/ardour/coreaudiosource.cc +++ b/libs/ardour/coreaudiosource.cc @@ -31,16 +31,12 @@ CoreAudioSource::CoreAudioSource (const XMLNode& node) : AudioFileSource (node) { init (_name); - - AudioSourceCreated (this); /* EMIT SIGNAL */ } CoreAudioSource::CoreAudioSource (const string& idstr, Flag flags) : AudioFileSource(idstr, flags) { init (idstr); - - AudioSourceCreated (this); /* EMIT SIGNAL */ } void diff --git a/libs/ardour/insert.cc b/libs/ardour/insert.cc index f9ead93dbc..1c3ce510f3 100644 --- a/libs/ardour/insert.cc +++ b/libs/ardour/insert.cc @@ -35,7 +35,7 @@ #include #endif -#ifdef HAVE_COREAUDIO +#ifdef HAVE_AUDIOUNITS #include #endif @@ -513,7 +513,7 @@ PluginInsert::plugin_factory (boost::shared_ptr other) #ifdef VST_SUPPORT boost::shared_ptr vp; #endif -#ifdef HAVE_COREAUDIO +#ifdef HAVE_AUDIOUNITS boost::shared_ptr ap; #endif @@ -523,7 +523,7 @@ PluginInsert::plugin_factory (boost::shared_ptr other) } else if ((vp = boost::dynamic_pointer_cast (other)) != 0) { return boost::shared_ptr (new VSTPlugin (*vp)); #endif -#ifdef HAVE_COREAUDIO +#ifdef HAVE_AUDIOUNITS } else if ((ap = boost::dynamic_pointer_cast (other)) != 0) { return boost::shared_ptr (new AUPlugin (*ap)); #endif @@ -829,7 +829,7 @@ PluginInsert::type () #ifdef VST_SUPPORT boost::shared_ptr vp; #endif -#ifdef HAVE_COREAUDIO +#ifdef HAVE_AUDIOUNITS boost::shared_ptr ap; #endif @@ -841,7 +841,7 @@ PluginInsert::type () } else if ((vp = boost::dynamic_pointer_cast (other)) != 0) { return ARDOUR::VST; #endif -#ifdef HAVE_COREAUDIO +#ifdef HAVE_AUDIOUNITS } else if ((ap = boost::dynamic_pointer_cast (other)) != 0) { return ARDOUR::AudioUnit; #endif @@ -1068,3 +1068,4 @@ PortInsert::input_streams() const { return n_outputs (); } + diff --git a/libs/ardour/plugin.cc b/libs/ardour/plugin.cc index bedc32a0b3..8d200b0ee4 100644 --- a/libs/ardour/plugin.cc +++ b/libs/ardour/plugin.cc @@ -261,7 +261,7 @@ ARDOUR::find_plugin(Session& session, string name, long unique_id, PluginType ty break; #endif -#ifdef HAVE_COREAUDIO +#ifdef HAVE_AUDIOUNITS case ARDOUR::AudioUnit: plugs = AUPluginInfo::discover (); unique_id = 0; // Neither do AU. @@ -282,3 +282,4 @@ ARDOUR::find_plugin(Session& session, string name, long unique_id, PluginType ty return PluginPtr ((Plugin*) 0); } + diff --git a/libs/ardour/source_factory.cc b/libs/ardour/source_factory.cc index 8432bcbd6f..e5bbe96d5e 100644 --- a/libs/ardour/source_factory.cc +++ b/libs/ardour/source_factory.cc @@ -23,6 +23,10 @@ #include #include +#ifdef HAVE_COREAUDIO +#include +#endif + #include "i18n.h" using namespace ARDOUR; @@ -31,8 +35,6 @@ using namespace std; sigc::signal > SourceFactory::SourceCreated; #ifdef HAVE_COREAUDIO - - boost::shared_ptr SourceFactory::create (const XMLNode& node) { diff --git a/libs/ardour/utils.cc b/libs/ardour/utils.cc index 5f676964d2..9e8603827a 100644 --- a/libs/ardour/utils.cc +++ b/libs/ardour/utils.cc @@ -253,7 +253,7 @@ path_expand (string path) #endif } -#ifdef HAVE_COREAUDIO +#if defined(HAVE_COREAUDIO) || defined(HAVE_AUDIOUNITS) string CFStringRefToStdString(CFStringRef stringRef) { @@ -297,4 +297,3 @@ compute_equal_power_fades (jack_nframes_t nframes, float* in, float* out) in[n] = inVal * (scale * inVal + 1.0f - scale); } } - -- cgit v1.2.3