diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2011-10-18 15:08:42 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-10-18 15:08:42 +0000 |
| commit | 4aeebb914eedf9279e4904786ce42518611de137 (patch) | |
| tree | bd703e27352128971955ceae57d1762aeb9698bc /gtk2_ardour | |
| parent | 41dd8bd811f2fea4ecb048b8075e06f9222294ce (diff) | |
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
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/plugin_selector.cc | 6 | ||||
| -rw-r--r-- | gtk2_ardour/plugin_ui.h | 2 | ||||
| -rw-r--r-- | gtk2_ardour/processor_box.cc | 2 | ||||
| -rw-r--r-- | gtk2_ardour/wscript | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/gtk2_ardour/plugin_selector.cc b/gtk2_ardour/plugin_selector.cc index 1b00c56fd9..a6da21e4b7 100644 --- a/gtk2_ardour/plugin_selector.cc +++ b/gtk2_ardour/plugin_selector.cc @@ -374,13 +374,13 @@ PluginSelector::lxvst_refiller (const std::string&) } void -#ifdef HAVE_AUDIOUNITS +#ifdef AUDIOUNIT_SUPPORT PluginSelector::au_refiller (const std::string& filterstr) #else PluginSelector::au_refiller (const std::string&) #endif { -#ifdef HAVE_AUDIOUNITS +#ifdef AUDIOUNIT_SUPPORT refiller (manager->au_plugin_info(), filterstr, "AU"); #endif } @@ -604,7 +604,7 @@ PluginSelector::build_plugin_menu () #ifdef LXVST_SUPPORT all_plugs.insert (all_plugs.end(), manager->lxvst_plugin_info().begin(), manager->lxvst_plugin_info().end()); #endif -#ifdef HAVE_AUDIOUNITS +#ifdef AUDIOUNIT_SUPPORT all_plugs.insert (all_plugs.end(), manager->au_plugin_info().begin(), manager->au_plugin_info().end()); #endif #ifdef LV2_SUPPORT diff --git a/gtk2_ardour/plugin_ui.h b/gtk2_ardour/plugin_ui.h index e060907986..20282c4cfa 100644 --- a/gtk2_ardour/plugin_ui.h +++ b/gtk2_ardour/plugin_ui.h @@ -304,7 +304,7 @@ class PluginUIWindow : public Gtk::Window bool create_lv2_editor (boost::shared_ptr<ARDOUR::PluginInsert>); }; -#ifdef AUDIOUNITS +#ifdef AUDIOUNIT_SUPPORT /* this function has to be in a .mm file */ extern PlugUIBase* create_au_gui (boost::shared_ptr<ARDOUR::PluginInsert>, Gtk::VBox**); #endif diff --git a/gtk2_ardour/processor_box.cc b/gtk2_ardour/processor_box.cc index 9f2f1ed1e5..80b2352788 100644 --- a/gtk2_ardour/processor_box.cc +++ b/gtk2_ardour/processor_box.cc @@ -76,7 +76,7 @@ #include "i18n.h" -#ifdef HAVE_AUDIOUNITS +#ifdef AUDIOUNIT_SUPPORT class AUPluginUI; #endif diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript index 0b5a95fbdc..296c0aaa64 100644 --- a/gtk2_ardour/wscript +++ b/gtk2_ardour/wscript @@ -397,7 +397,7 @@ def build(bld): if bld.is_defined('PHONE_HOME'): obj.defines += [ 'PHONE_HOME' ] - if bld.is_defined('COREAUDIO'): + if bld.is_defined('HAVE_COREAUDIO'): TaskGen.task_gen.mappings['.mm'] = TaskGen.task_gen.mappings['.cc'] obj.source += [ 'cocoacarbon.mm', 'au_pluginui.mm' ] obj.use += ' libappleutility ' |